commit 9dae09d3f57fc14e3106af86ad748d3bc14f21b4 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Thu Jan 18 08:20:28 2018 +0000 fix build with ffmpeg-3.5 dvbcut.spec | 2 ++ ffmpeg35_buildfix.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) --- diff --git a/dvbcut.spec b/dvbcut.spec index 76a4cde..6cdca46 100644 --- a/dvbcut.spec +++ b/dvbcut.spec @@ -28,6 +28,7 @@ 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 Patch10: %{name}-svn179-ffmpeg-3.0.3-compatibility.patch +Patch11: ffmpeg35_buildfix.patch BuildRequires: autoconf BuildRequires: qt3-devel @@ -66,6 +67,7 @@ dvbcut can use Mplayer if available. %patch8 -b .ffmpeg-2.0 %patch9 -p1 -b .ffmpeg-2.4.3 %patch10 -p1 -b .ffmpeg-3.0.3 +%patch11 -p1 -b .ffmpeg35 # Fix QTDIR libs in configure sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch new file mode 100644 index 0000000..d52a835 --- /dev/null +++ b/ffmpeg35_buildfix.patch @@ -0,0 +1,12 @@ +--- a/src/stream.h ++++ b/src/stream.h +@@ -94,7 +94,7 @@ + // assume default is OK, so just comment out. + // avcc->lmax= FF_QP2LAMBDA * 2; + if (interlaced) +- avcc->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME; ++ avcc->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME; + } + + friend class mpgfile; +