FFMPEG #974: Use latest FFMPEG 3.4.1 (1/2)

Patch 1/2 for https://github.com/HandBrake/HandBrake/issues/974
moving to FFMPEG 3.4.1 from LIBAV 12.2.

The re-ordering of to be linked modules was required to solve
statically linked dependencies. See libhb/module.defs etc.

5 files changed, 21 insertions, 9 deletions

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 2957761fb..70c8577de 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -13,9 +13,9 @@ __deps__ += X264
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url    = https://download.handbrake.fr/handbrake/contrib/libav-12.3.tar.gz
-FFMPEG.FETCH.url   += https://libav.org/releases/libav-12.3.tar.gz
-FFMPEG.FETCH.sha256 = 115b659022dd387f662e26fbc5bc0cc14ec18daa100003ffd34f4da0479b272e
+FFMPEG.FETCH.url = http://www.ffmpeg.org/releases/ffmpeg-3.4.1.tar.gz
+FFMPEG.FETCH.url += https://download.handbrake.fr/handbrake/contrib/ffmpeg-3.4.1.tar.gz
+FFMPEG.FETCH.sha256 = 3b6824f2c3ddd6bde37b82f76c679867f5c18d0c040cea222afd93aac9bf7ad2
 
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.host  =
@@ -28,9 +28,11 @@ FFMPEG.CONFIGURE.extra = \
     --disable-doc \
     --disable-bsfs \
     --enable-bsf=aac_adtstoasc \
-    --disable-avconv \
-    --disable-avplay \
-    --disable-avprobe \
+    --disable-programs \
+    --disable-ffmpeg \
+    --disable-ffplay \
+    --disable-ffprobe \
+    --disable-ffserver \
     --disable-avdevice \
     --disable-muxers \
     --disable-network \
@@ -38,6 +40,7 @@ FFMPEG.CONFIGURE.extra = \
     --disable-vaapi \
     --disable-vdpau \
     --disable-encoders \
+    --enable-avresample \
     --enable-libmp3lame \
     --enable-encoder=aac \
     --enable-encoder=ac3 \
@@ -53,6 +56,13 @@ FFMPEG.CONFIGURE.extra = \
     --disable-decoder=libvpx_vp8 \
     --enable-encoder=libvpx_vp9 \
     --disable-decoder=libvpx_vp9 \
+    --disable-decoder=crystalhd \
+    --disable-decoder=h264_crystalhd \
+    --disable-decoder=mpeg2_crystalhd \
+    --disable-decoder=mpeg4_crystalhd \
+    --disable-decoder=msmpeg4_crystalhd \
+    --disable-decoder=vc1_crystalhd \
+    --disable-decoder=wmv3_crystalhd \
     --enable-zlib \
     --enable-bzlib \
     --enable-pthreads \
diff --git a/gtk/configure.ac b/gtk/configure.ac
index 90a37c04a..550cbaff4 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -177,7 +177,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
 
 GHB_CFLAGS="$HBINC $GHB_CFLAGS"
 
-HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavfilter -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus"
+HB_LIBS="-lhandbrake -lavresample -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus"
 
 case $host in
   *-*-mingw*)
diff --git a/libhb/module.defs b/libhb/module.defs
index d39f7d7b6..ba924b841 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -130,7 +130,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
-        ass avcodec avformat avfilter avutil avresample dvdnav dvdread \
+        ass avformat avfilter avcodec avutil avresample swresample postproc dvdnav dvdread \
         freetype mp3lame samplerate swscale vpx theora vorbis vorbisenc ogg \
         x264 xml2 bluray jansson harfbuzz opus, \
         $(CONTRIB.build/)lib/lib$(n).a )
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index c599dda0a..c9115cf58 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -1197,10 +1197,12 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu
         {
             pkt.flags |= AV_PKT_FLAG_KEY;
         }
+#ifdef AV_PKT_FLAG_DISPOSABLE
         if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF))
         {
             pkt.flags |= AV_PKT_FLAG_DISPOSABLE;
         }
+#endif
     }
     else if (buf->s.frametype & HB_FRAME_MASK_KEY)
     {
diff --git a/test/module.defs b/test/module.defs
index 2015bc212..1260d7eac 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -14,7 +14,7 @@ TEST.GCC.L = $(CONTRIB.build/)lib
 TEST.libs = $(LIBHB.a)
 
 TEST.GCC.l = \
-        ass avresample avformat avcodec avfilter avutil mp3lame dvdnav \
+        ass avresample avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
         dvdread fribidi \
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
         bluray freetype xml2 bz2 z jansson harfbuzz opus