| 1 |
aballier 08/10/06 22:03:03 |
| 2 |
|
| 3 |
Added: xine-lib-1.1.15-ffmpeg.patch |
| 4 |
Log: |
| 5 |
add upstream patch to fix build against ffmpeg trunk |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xine-lib-1.1.15-ffmpeg.patch |
| 15 |
=================================================================== |
| 16 |
# HG changeset patch |
| 17 |
# User Darren Salt <linux@××××××××××××××××××××××××.uk> |
| 18 |
# Date 1221306490 -3600 |
| 19 |
# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c |
| 20 |
# Parent 89c3e23896babb1fc6fe0f4299fa645a47297d4c |
| 21 |
Compilation fixes for ffmpeg API & ABI changes. |
| 22 |
|
| 23 |
diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ff_audio_decoder.c |
| 24 |
--- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008 +0200 |
| 25 |
+++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008 +0100 |
| 26 |
@@ -322,7 +322,7 @@ |
| 27 |
|
| 28 |
if (!this->output_open) { |
| 29 |
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { |
| 30 |
- avcodec_decode_audio (this->context, |
| 31 |
+ avcodec_decode_audio2 (this->context, |
| 32 |
(int16_t *)this->decode_buffer, |
| 33 |
&decode_buffer_size, |
| 34 |
&this->buf[0], |
| 35 |
diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ffmpeg_decoder.h |
| 36 |
--- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008 +0200 |
| 37 |
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008 +0100 |
| 38 |
@@ -33,6 +33,10 @@ |
| 39 |
# include "../../libffmpeg/libavcodec/avcodec.h" |
| 40 |
#endif |
| 41 |
|
| 42 |
+#if LIBAVCODEC_VERSION_MAJOR > 51 |
| 43 |
+#define bits_per_sample bits_per_coded_sample |
| 44 |
+#endif |
| 45 |
+ |
| 46 |
typedef struct ff_codec_s { |
| 47 |
uint32_t type; |
| 48 |
enum CodecID id; |
Archives