rpms/dvbcut/devel dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch, NONE, 1.1 dvbcut.spec, 1.29, 1.30

David Timms dtimms at rpmfusion.org
Mon Oct 20 13:48:42 CEST 2014


Author: dtimms

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

Modified Files:
	dvbcut.spec 
Added Files:
	dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch 
Log Message:
add patch for deprecated av_new_stream ffmpeg function.


dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch:
 lavfmuxer.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch ---
--- dvbcut-svn179.orig/src/lavfmuxer.cpp	2014-10-20 19:36:01.108711000 +1100
+++ dvbcut-svn179/src/lavfmuxer.cpp	2014-10-20 21:35:28.682373468 +1100
@@ -60,7 +60,8 @@
   int id=0;
 
   st[VIDEOSTREAM].stream_index=id;
-  AVStream *s=st[VIDEOSTREAM].avstr=av_new_stream(avfc,id++);
+  AVStream *s=st[VIDEOSTREAM].avstr=avformat_new_stream(avfc, NULL);
+  s->id = id++;
   strpres[VIDEOSTREAM]=true;
   av_free(s->codec);
   mpg.setvideoencodingparameters();
@@ -74,7 +75,8 @@
     if (audiostreammask & (1u<<i)) {
       int astr=audiostream(i);
       st[astr].stream_index=id;
-      s=st[astr].avstr=av_new_stream(avfc,id++);
+      s=st[astr].avstr=avformat_new_stream(avfc,NULL);
+      s->id = id++;
       strpres[astr]=true;
       if (s->codec)
         av_free(s->codec);


Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dvbcut.spec	26 Sep 2014 19:05:59 -0000	1.29
+++ dvbcut.spec	20 Oct 2014 11:48:42 -0000	1.30
@@ -7,7 +7,7 @@
 
 Name:    dvbcut
 Version: 0.6.1
-Release: 17.svn%{svnrev}%{?dist}
+Release: 18.svn%{svnrev}%{?dist}
 Summary: Clip and convert DVB transport streams to MPEG2 program streams
 
 Group:   Applications/Multimedia
@@ -31,6 +31,7 @@
 Patch6:  %{name}-179-vs-ubuntu-12.04.diff
 Patch7:  %{name}-svn179-ffmpeg-0.11.1.patch
 Patch8:  %{name}-svn179-ffmpeg-2.0-compatibility.patch
+Patch9:  %{name}-svn179-ffmpeg-2.4.3-compatibility.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf
@@ -68,6 +69,7 @@
 %patch6 -b .ubuntu
 %patch7 -p1 -b .ffmpeg-0.11.1
 %patch8 -b .ffmpeg-2.0
+%patch9 -p1 -b .ffmpeg-2.4.3
 
 # Fix QTDIR libs in configure
 sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
@@ -137,6 +139,9 @@
 
 
 %changelog
+* Mon Oct 20 2014 David Timms <iinet.net.au at dtimms> - 0.6.1-18.svn179
+- add patch for ffmpeg-2.4.3 for dropped av_new_stream().
+
 * Fri Sep 26 2014 Nicolas Chauvet <kwizart at gmail.com> - 0.6.1-17.svn179
 - Rebuilt for FFmpeg 2.4.x
 


More information about the rpmfusion-commits mailing list