Merge oe-devel@oe-devel.bkbits.net:openembedded

[vuplus_openembedded] / libxine / libxine-1.0.0-beta12 / libxine-libvorbis.patch

diff --git a/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch b/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch
deleted file mode 100644 (file)
index f52754d..0000000
--- a/libxine/libxine-1.0.0-beta12/libxine-libvorbis.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Copyright (C) 2002, Fred Boulay <dilb@handhelds.org>
-Licensed under GPL v2
-
---- src/libvorbis/xine_decoder.c.orig  2002-12-18 01:35:37.000000000 +0100
-+++ src/libvorbis/xine_decoder.c       2002-12-18 01:35:48.000000000 +0100
-@@ -34,7 +34,7 @@
- #include "buffer.h"
- 
- #include <ogg/ogg.h>
--#include <vorbis/codec.h>
-+#include <tremor/ivorbiscodec.h>
- 
- #define MAX_NUM_SAMPLES 4096
- 
---- src/libvorbis/xine_decoder.c.orig  2002-12-19 17:09:30.000000000 +0100
-+++ src/libvorbis/xine_decoder.c       2002-12-19 17:09:35.000000000 +0100
-@@ -202,7 +202,7 @@ static void vorbis_decode_data (audio_de
-  
-   } else if (this->output_open) {
- 
--    float **pcm;
-+    int **pcm;
-     int samples;
- 
-     if(vorbis_synthesis(&this->vb,op)==0) 
-@@ -221,9 +221,9 @@ static void vorbis_decode_data (audio_de
-        interleave */
-       for(i=0;i<this->vi.channels;i++){
-       ogg_int16_t *ptr=audio_buffer->mem+i;
--      float  *mono=pcm[i];
-+      int *mono=pcm[i];
-       for(j=0;j<bout;j++){
--        int val=mono[j]*32767.f;
-+        int val=mono[j]>>9;
-         /* might as well guard against clipping */
-         if(val>32767){
-           val=32767;