diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-20 18:40:13 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-20 18:40:13 +0000 |
| commit | 0f4e2eb0c6e73e4fa6201da07da32f3146789633 (patch) | |
| tree | 14b3a712458463d7a7a1cd434862ff272f76d51d | |
| parent | c8c75d6c2f8132738420e9fbf808164af13850fb (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/20 18:56:37+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/02/20 18:54:33+01:00 handhelds.org!zecke
XINE for Opie:
Update the patch to catch up tremors catch up (vorbis_synthesis signature was updatet)
2005/02/20 17:44:56+00:00 nexus.co.uk!pb
update gpe-dm to 0.44
BKrev: 4218d98dTcHctco8AgGxgwFafpAIMQ
| -rw-r--r-- | packages/gpe-dm/gpe-dm_0.44.bb | 0 | ||||
| -rw-r--r-- | packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch | 39 |
2 files changed, 39 insertions, 0 deletions
diff --git a/packages/gpe-dm/gpe-dm_0.44.bb b/packages/gpe-dm/gpe-dm_0.44.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-dm/gpe-dm_0.44.bb diff --git a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch b/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch index e69de29bb2..81bcbd5468 100644 --- a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch +++ b/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch @@ -0,0 +1,39 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: xine-lib-1.0/src/libvorbis/xine_decoder.c +=================================================================== +--- xine-lib-1.0.orig/src/libvorbis/xine_decoder.c 2005-02-20 18:21:57.924625900 +0100 ++++ xine-lib-1.0/src/libvorbis/xine_decoder.c 2005-02-20 18:52:02.016033646 +0100 +@@ -40,7 +40,7 @@ + #include "buffer.h" + + #include <ogg/ogg.h> +-#include <vorbis/codec.h> ++#include <tremor/ivorbiscodec.h> + + #define MAX_NUM_SAMPLES 4096 + +@@ -216,7 +216,7 @@ + + } else if (this->output_open) { + +- float **pcm; ++ int **pcm; + int samples; + + if(vorbis_synthesis(&this->vb,&this->op,1)==0) +@@ -245,9 +245,9 @@ + 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; |