diff options
| author | Sven Gothel <[email protected]> | 2017-12-25 23:51:31 +0100 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-05-28 23:56:14 -0400 |
| commit | 6c5faa037d2955421dd7bae44f6f5f15b9b011a2 (patch) | |
| tree | f2bb7645a6c2d3662812cbca47362bd67c299e59 /contrib/ffmpeg | |
| parent | fd2241a344b141fb5f1b8ec479dbb5783826f1ce (diff) | |
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.
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 22 |
1 files changed, 16 insertions, 6 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 \ |