[dvdstyler] fix build with ffmpeg-3.5

commit 13632e71668fe5e303c4f3a51da43a56ce4732fa Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Thu Jan 18 08:31:38 2018 +0000 fix build with ffmpeg-3.5 dvdstyler.spec | 2 ++ ffmpeg35_buildfix.patch | 12 ++++++++++++ sources | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) --- diff --git a/dvdstyler.spec b/dvdstyler.spec index a18f37c..a6cb519 100644 --- a/dvdstyler.spec +++ b/dvdstyler.spec @@ -13,6 +13,7 @@ License: GPLv2+ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}... Patch1: dvdstyler-wxwin.m4.patch +Patch2: ffmpeg35_buildfix.patch # build BuildRequires: automake autoconf BuildRequires: gettext @@ -57,6 +58,7 @@ create navigational DVD menus similar to those found on most commercial DVDs. %prep %setup -q -n DVDStyler-%{version}%{?prerel} %patch1 -p1 +%patch2 -p1 #{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h %build diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch new file mode 100644 index 0000000..1ca0e8e --- /dev/null +++ b/ffmpeg35_buildfix.patch @@ -0,0 +1,12 @@ +--- a/src/mediaenc_ffmpeg.cpp ++++ b/src/mediaenc_ffmpeg.cpp +@@ -223,7 +223,7 @@ + c->time_base = (AVRational){ 1, c->sample_rate }; + // some formats want stream headers to be separate + if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return true; + } + diff --git a/sources b/sources index b33f8fc..d3642f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eea373502e284466229030dadef1c7a8 DVDStyler-3.0.4.tar.bz2 +5008ea1488809fb0ca877b4e617ae5a7 DVDStyler-3.0.4.tar.bz2