diff options
| author | Bradley Sepos <[email protected]> | 2018-05-29 18:40:13 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-05-29 18:40:13 -0400 |
| commit | e514e776d1d65a4dcaa340d7cd029d0835291119 (patch) | |
| tree | 1cf013f87434a3cbf625b5ebf1263bdc8e87acfa /contrib/ffmpeg | |
| parent | bea1fc6363a0da70b3dcd84ffd071d124b9dda47 (diff) | |
contrib: Revise FFmpeg module.
Addresses suggestions here https://github.com/HandBrake/HandBrake/issues/1370#issuecomment-392958720
-fomit-frame-pointer may still be required on 32-bit Intel; however, we no longer support 32-bit builds.
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 93a340e2a..fee661133 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -26,9 +26,6 @@ FFMPEG.CONFIGURE.extra = \ --disable-bsfs \ --enable-bsf=aac_adtstoasc \ --disable-programs \ - --disable-ffmpeg \ - --disable-ffplay \ - --disable-ffprobe \ --disable-avdevice \ --disable-muxers \ --disable-network \ @@ -51,16 +48,10 @@ FFMPEG.CONFIGURE.extra = \ --disable-encoder=libspeex \ --enable-decoder=libspeex \ --enable-libvpx \ + --disable-decoder=libvpx_* \ --enable-encoder=libvpx_vp8 \ - --disable-decoder=libvpx_vp8 \ --enable-encoder=libvpx_vp9 \ - --disable-decoder=libvpx_vp9 \ - --disable-decoder=h264_crystalhd \ - --disable-decoder=mpeg2_crystalhd \ - --disable-decoder=mpeg4_crystalhd \ - --disable-decoder=msmpeg4_crystalhd \ - --disable-decoder=vc1_crystalhd \ - --disable-decoder=wmv3_crystalhd \ + --disable-decoder=*_crystalhd \ --enable-lzma \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" @@ -98,9 +89,6 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) else FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe) endif -else - # only enable pthreads for non-win32 - FFMPEG.CONFIGURE.extra += --enable-pthreads endif ifneq (none,$(FFMPEG.GCC.g)) @@ -126,14 +114,6 @@ endif ## enable compile verbosity FFMPEG.BUILD.extra = V=1 -# 32-bit intel -ifneq (,$(filter $(BUILD.machine),i386 i486 i586 i686)) - # avoid running out of registers - FFMPEG.GCC.args.extra += -fomit-frame-pointer - # avoid 'asm' operand has impossible constraints errors - FFMPEG.CONFIGURE.extra += --disable-inline-asm -endif - ## For POSIX.1-2001 ifeq (solaris,$(BUILD.system)) FFMPEG.CONFIGURE.extra += --extra-libs=/usr/lib/values-xpg6.o |