diff options
Diffstat (limited to 'xine-lib/ffmpeg-0.11.patch')
-rw-r--r-- | xine-lib/ffmpeg-0.11.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/xine-lib/ffmpeg-0.11.patch b/xine-lib/ffmpeg-0.11.patch deleted file mode 100644 index c24aee8a3..000000000 --- a/xine-lib/ffmpeg-0.11.patch +++ /dev/null @@ -1,78 +0,0 @@ -From ebbd60ff7043826886cd7c35fde9e06bfe3b5093 Mon Sep 17 00:00:00 2001 -From: Edgar Hucek -Date: Sun, 29 Jan 2012 21:39:38 +0000 -Subject: fix compile against recent ffmpeg - ---- -diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c -index ecfa0a8..2ec18c5 100644 ---- a/src/combined/ffmpeg/ff_video_decoder.c -+++ b/src/combined/ffmpeg/ff_video_decoder.c -@@ -130,7 +130,9 @@ struct ff_video_decoder_s { - - yuv_planes_t yuv; - -+#ifdef AVPaletteControl - AVPaletteControl palette_control; -+#endif - - #ifdef LOG - enum PixelFormat debug_fmt; -@@ -218,7 +220,9 @@ static int get_buffer(AVCodecContext *context, AVFrame *av_frame){ - /* We should really keep track of the ages of xine frames (see - * avcodec_default_get_buffer in libavcodec/utils.c) - * For the moment tell ffmpeg that every frame is new (age = bignumber) */ -+#ifdef AVFRAMEAGE - av_frame->age = 256*256*256*64; -+#endif - - av_frame->type= FF_BUFFER_TYPE_USER; - -@@ -1028,7 +1032,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b - memcpy(this->context->extradata, buf->decoder_info_ptr[2], - buf->decoder_info[2]); - -- } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { -+ } -+#ifdef AVPaletteControl -+ else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { - unsigned int i; - - palette_entry_t *demuxer_palette; -@@ -1047,7 +1053,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b - } - decoder_palette->palette_changed = 1; - -- } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { -+ } -+#endif -+ else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { - int i; - - lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n"); -@@ -1794,7 +1802,9 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, - this->av_frame = avcodec_alloc_frame(); - this->context = avcodec_alloc_context(); - this->context->opaque = this; -+#ifdef AVPaletteControl - this->context->palctrl = NULL; -+#endif - - this->decoder_ok = 0; - this->decoder_init_mode = 1; -diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h -index 371b5cc..69b9aa3 100644 ---- a/src/combined/ffmpeg/ffmpeg_compat.h -+++ b/src/combined/ffmpeg/ffmpeg_compat.h -@@ -91,5 +91,9 @@ - # define AVAUDIO 2 - #endif - -+/* AVFrame.age */ -+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) -+# define AVFRAMEAGE 1 -+#endif - - #endif /* XINE_AVCODEC_COMPAT_H */ --- -cgit v0.9.0.2-39-g756e |