rpms/kmediafactory/devel kmediafactory-0.8.1-ffmpeg.patch, 1.1, 1.2 kmediafactory.spec, 1.23, 1.24

Leigh Scott leigh123linux at rpmfusion.org
Sat Dec 7 17:41:29 CET 2013


Author: leigh123linux

Update of /cvs/free/rpms/kmediafactory/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3689

Modified Files:
	kmediafactory-0.8.1-ffmpeg.patch kmediafactory.spec 
Log Message:
* Sat Dec 07 2013 Leigh Scott <leigh123linux at googlemail.com> - 0.8.1-11
- fix ffmpeg compile error


kmediafactory-0.8.1-ffmpeg.patch:
 videofile.cpp |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Index: kmediafactory-0.8.1-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/kmediafactory-0.8.1-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmediafactory-0.8.1-ffmpeg.patch	22 Oct 2012 11:47:13 -0000	1.1
+++ kmediafactory-0.8.1-ffmpeg.patch	7 Dec 2013 16:41:28 -0000	1.2
@@ -22,3 +22,16 @@
           av_find_stream_info(avFromatContext) < 0) {
          close();
      }
+@@ -143,8 +143,11 @@ bool VideoFile::initialize()
+     }
+ 
+     avVideoCodecContext->workaround_bugs = 1;
+-
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
++    return avcodec_open2(avVideoCodecContext, avVideoCodec, NULL)>=0;
++#else
+     return avcodec_open(avVideoCodecContext, avVideoCodec)>=0;
++#endif
+ }
+ 
+ int VideoFile::getWidth()


Index: kmediafactory.spec
===================================================================
RCS file: /cvs/free/rpms/kmediafactory/devel/kmediafactory.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kmediafactory.spec	7 Dec 2013 14:51:42 -0000	1.23
+++ kmediafactory.spec	7 Dec 2013 16:41:28 -0000	1.24
@@ -1,7 +1,7 @@
 Name:           kmediafactory
 Summary:        A template based DVD authoring tool
 Version:        0.8.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 License:        GPLv2+
 URL:            http://code.google.com/p/kmediafactory/ 
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Sat Dec 07 2013 Leigh Scott <leigh123linux at googlemail.com> - 0.8.1-11
+- fix ffmpeg compile error
+
 * Sat Dec 07 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.8.1-10
 - Rebuilt for FFmpeg
 


More information about the rpmfusion-commits mailing list