diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 18 | ||||
| -rw-r--r-- | make/include/main.defs | 8 |
2 files changed, 2 insertions, 24 deletions
diff --git a/make/configure.py b/make/configure.py index 36c7cb31d..4081e26af 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1208,7 +1208,8 @@ def createCLI(): grp.add_option( '--enable-hwd', default=False, action='store_true', help=h ) h = IfHost( 'enable use of x265 encoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-x265', default=False, action='store_true', help=h ) + grp.add_option( '--enable-x265', default=True, action='store_true', help=h ) + grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' ) h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) @@ -1218,18 +1219,6 @@ def createCLI(): grp.add_option( '--enable-libav-aac', dest="enable_libav_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) grp.add_option( '--disable-libav-aac', dest="enable_libav_aac", action='store_false' ) - h = IfHost( 'enable use of mp4v2 muxer', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-mp4v2', dest="enable_mp4v2", default=True, action='store_true', help=h ) - grp.add_option( '--disable-mp4v2', dest="enable_mp4v2", action='store_false' ) - - h = IfHost( 'enable use of libmkv muxer', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-libmkv', dest="enable_libmkv", default=True, action='store_true', help=h ) - grp.add_option( '--disable-libmkv', dest="enable_libmkv", action='store_false' ) - - h = IfHost( 'enable use of avformat muxer', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-avformat', dest="enable_avformat", default=True, action='store_true', help=h ) - grp.add_option( '--disable-avformat', dest="enable_avformat", action='store_false' ) - cli.add_option_group( grp ) ## add launch options @@ -1679,9 +1668,6 @@ int main () doc.add( 'FEATURE.gst', int( not options.disable_gst )) doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) doc.add( 'FEATURE.libav_aac', int( options.enable_libav_aac )) - doc.add( 'FEATURE.mp4v2', int( options.enable_mp4v2 )) - doc.add( 'FEATURE.libmkv', int( options.enable_libmkv )) - doc.add( 'FEATURE.avformat', int( options.enable_avformat )) doc.add( 'FEATURE.qsv', int( options.enable_qsv )) doc.add( 'FEATURE.hwd', int( options.enable_hwd )) doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) diff --git a/make/include/main.defs b/make/include/main.defs index 513afe116..e756e9565 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -45,14 +45,6 @@ ifeq (1,$(FEATURE.fdk_aac)) MODULES += contrib/fdk-aac endif -ifeq (1,$(FEATURE.mp4v2)) - MODULES += contrib/mp4v2 -endif - -ifeq (1,$(FEATURE.libmkv)) - MODULES += contrib/libmkv -endif - ifeq (1,$(FEATURE.x265)) MODULES += contrib/x265 endif |