From: Jakub Bogusz Date: Sat, 17 Jan 2009 19:33:55 +0000 (+0000) Subject: - outdated X-Git-Tag: auto/ti/xine-lib-1_1_16_2-1~1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=56f71a6f54db3a23af71fbbb1ffe336872b66b72;p=packages%2Fxine-lib.git - outdated Changed files: xine-lib-ffmpeg.patch -> 1.2 xine-lib-gcc.patch -> 1.2 --- diff --git a/xine-lib-ffmpeg.patch b/xine-lib-ffmpeg.patch deleted file mode 100644 index 86e1774..0000000 --- a/xine-lib-ffmpeg.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# HG changeset patch -# User Darren Salt -# Date 1221306490 -3600 -# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c -# Parent 89c3e23896babb1fc6fe0f4299fa645a47297d4c -Compilation fixes for ffmpeg API & ABI changes. - ---- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008 +0200 -+++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008 +0100 -@@ -322,7 +322,7 @@ static void ff_audio_decode_data (audio_ - - if (!this->output_open) { - if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { -- avcodec_decode_audio (this->context, -+ avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[0], ---- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008 +0200 -+++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008 +0100 -@@ -33,6 +33,10 @@ - # include "../../libffmpeg/libavcodec/avcodec.h" - #endif - -+#if LIBAVCODEC_VERSION_MAJOR > 51 -+#define bits_per_sample bits_per_coded_sample -+#endif -+ - typedef struct ff_codec_s { - uint32_t type; - enum CodecID id; - diff --git a/xine-lib-gcc.patch b/xine-lib-gcc.patch deleted file mode 100644 index 9fe358f..0000000 --- a/xine-lib-gcc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xine-lib-1.1.15/src/xine-engine/buffer.h xine-lib-1.1.15.new/src/xine-engine/buffer.h ---- xine-lib-1.1.15/src/xine-engine/buffer.h 2008-07-16 23:01:56.000000000 +0200 -+++ xine-lib-1.1.15.new/src/xine-engine/buffer.h 2008-08-24 16:49:19.477371688 +0200 -@@ -676,7 +676,7 @@ - /* convert xine_waveformatex struct from little endian */ - void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; - --static inline _x_is_fourcc(void *ptr, void *tag) { -+static __inline _x_is_fourcc(void *ptr, void *tag) { - return memcmp(ptr, tag, 4) == 0; - } - -Tylko w xine-lib-1.1.15.new/src/xine-engine: buffer.h~