summaryrefslogtreecommitdiff
path: root/packages/libxine/libxine-opie-1.0
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2005-04-17 03:03:31 +0000
committerChris Lord <chris@openedhand.com>2005-04-17 03:03:31 +0000
commitca324c3ec4522fed89197c039f379d8abdde5ed6 (patch)
tree86257998b21a30cd8817c242b5aa6055b12ee69e /packages/libxine/libxine-opie-1.0
parented7932655cce2e34352282994af20862eb56675d (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/04/17 04:02:51+01:00 (none)!cwiiis Move some patches from libxine-opie-1.0 to files, and apply them to libxine_1.0 BKrev: 4261d203seT0HI4tEww5LGp8XGhuFQ
Diffstat (limited to 'packages/libxine/libxine-opie-1.0')
-rw-r--r--packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch0
-rw-r--r--packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch0
-rw-r--r--packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch0
-rw-r--r--packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch39
-rw-r--r--packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch0
-rw-r--r--packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch0
6 files changed, 0 insertions, 39 deletions
diff --git a/packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch b/packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch
+++ /dev/null
diff --git a/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch b/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch
+++ /dev/null
diff --git a/packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch b/packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch
+++ /dev/null
diff --git a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch b/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch
deleted file mode 100644
index 81bcbd5468..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#
-# 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;
diff --git a/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch b/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch
+++ /dev/null
diff --git a/packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch b/packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch
+++ /dev/null