rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.21-ffmpeg20.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.51, 1.52

[Xavier Bachelot]

Author: xavierb

Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17700

Modified Files:
	xine-lib-extras-freeworld.spec 
Added Files:
	xine-lib-1.1.21-ffmpeg20.patch 
Log Message:
Fix build for ffmpeg 2.0

xine-lib-1.1.21-ffmpeg20.patch:
 ff_audio_decoder.c |    5 +++++
 ff_video_decoder.c |    2 +-
 ffmpeg_decoder.h   |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE xine-lib-1.1.21-ffmpeg20.patch ---
--- xine-lib-1.1.21/src/combined/ffmpeg/ffmpeg_decoder.h.orig	2013-08-28 22:43:33.653572011 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ffmpeg_decoder.h	2013-08-28 22:44:24.087787844 +0200
@@ -35,7 +35,7 @@
 
 typedef struct ff_codec_s {
   uint32_t          type;
-  enum CodecID      id;
+  enum AVCodecID      id;
   const char       *name;
 } ff_codec_t;
 
--- xine-lib-1.1.21/src/combined/ffmpeg/ff_audio_decoder.c.orig	2013-08-28 23:07:28.399833089 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ff_audio_decoder.c	2013-08-28 23:09:41.375423336 +0200
@@ -47,6 +47,11 @@
 
 #define AUDIOBUFSIZE (64 * 1024)
 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+/* from libavcodec/avcodec.h dated Dec 23 2012 */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } ff_audio_class_t;
--- xine-lib-1.1.21/src/combined/ffmpeg/ff_video_decoder.c.orig	2013-08-28 23:30:14.261671159 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ff_video_decoder.c	2013-08-28 23:30:55.725849741 +0200
@@ -1055,7 +1055,7 @@
         this->bih.biWidth  = _X_BE_16(&this->buf[12]);
         this->bih.biHeight = _X_BE_16(&this->buf[14]);
 
-        this->context->sub_id = _X_BE_32(&this->buf[30]);
+/*        this->context->sub_id = _X_BE_32(&this->buf[30]); */
 
         this->context->slice_offset = calloc(SLICE_OFFSET_SIZE, sizeof(int));
         this->slice_offset_size = SLICE_OFFSET_SIZE;


Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xine-lib-extras-freeworld.spec	15 Aug 2013 10:20:12 -0000	1.51
+++ xine-lib-extras-freeworld.spec	4 Sep 2013 19:24:38 -0000	1.52
@@ -4,7 +4,7 @@
 Name:           xine-lib-extras-freeworld
 Summary:        Extra codecs for the Xine multimedia library
 Version:        1.1.21
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -13,6 +13,7 @@
 
 Patch0:         xine-lib-1.1.19-no_autopoint.patch
 Patch1:         xine-lib-1.1.4-optflags.patch
+Patch2:         xine-lib-1.1.21-ffmpeg20.patch
 
 BuildRequires:  autoconf automake libtool
 BuildRequires:  pkgconfig
@@ -63,6 +64,7 @@
 # extra work for to omit old libtool-related crud
 rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 %patch1 -p1 -b .optflags
+%patch2 -p1 -b .ffmpeg20
 
 ./autogen.sh noconfig
 
@@ -176,6 +178,9 @@
 
 
 %changelog
+* Wed Aug 28 2013 Xavier Bachelot <xavier at bachelot.org> - 1.1.21-8
+- Fix build for ffmpeg 2.0.
+
 * Thu Aug 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.1.21-7
 - Rebuilt for FFmpeg 2.0.x