File xine-lib-1.1.15-ffmpeg.diff of Package libxine1

File xine-lib-1.1.15-ffmpeg.diff of Package libxine1 (Revision 1dc6c0bf4f1abb0719a1d45bd31f1d78)

Currently displaying revision 1dc6c0bf4f1abb0719a1d45bd31f1d78, show latest

diff -ur xine-lib-1.1.15.orig/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.15.orig/src/combined/ffmpeg/ff_audio_decoder.c	2008-07-16 01:13:03.000000000 +0200
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c	2008-09-14 13:28:20.000000000 +0200
@@ -322,7 +322,7 @@
 
     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],
diff -ur xine-lib-1.1.15.orig/src/combined/ffmpeg/ffmpeg_decoder.h xine-lib-1.1.15/src/combined/ffmpeg/ffmpeg_decoder.h
--- xine-lib-1.1.15.orig/src/combined/ffmpeg/ffmpeg_decoder.h	2008-05-19 16:15:42.000000000 +0200
+++ xine-lib-1.1.15/src/combined/ffmpeg/ffmpeg_decoder.h	2008-09-14 13:28:20.000000000 +0200
@@ -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;