diff options
| author | jstebbins <[email protected]> | 2013-06-30 20:44:21 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-06-30 20:44:21 +0000 |
| commit | ba3674603258b9bd9662af2b8f2225f9e9395ca1 (patch) | |
| tree | 69cf3e5d77d21f07a57554ae5d1dd2bfa78e7f8b /make | |
| parent | d6fcba15d04322d3b6495cae70b813be5c3243b4 (diff) | |
libhb: add experimental avformat muxer for mkv and mp4
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5620 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 15 | ||||
| -rw-r--r-- | make/include/main.defs | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/make/configure.py b/make/configure.py index af893ddae..9a98017ce 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1188,6 +1188,18 @@ def createCLI(): grp.add_option( '--enable-faac', dest="enable_faac", default=False, action='store_true', help=h ) grp.add_option( '--disable-faac', dest="enable_faac", 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 @@ -1630,6 +1642,9 @@ int main () doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) doc.add( 'FEATURE.libav_aac', int( options.enable_libav_aac )) doc.add( 'FEATURE.faac', int( options.enable_faac )) + 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.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) if not Tools.xcodebuild.fail and not options.disable_xcode: diff --git a/make/include/main.defs b/make/include/main.defs index 08901bd27..2554c11e7 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -47,13 +47,19 @@ ifeq (1,$(FEATURE.faac)) MODULES += contrib/faac endif +ifeq (1,$(FEATURE.mp4v2)) + MODULES += contrib/mp4v2 +endif + +ifeq (1,$(FEATURE.libmkv)) + MODULES += contrib/libmkv +endif + MODULES += contrib/lame MODULES += contrib/ffmpeg MODULES += contrib/libdvdread MODULES += contrib/libdvdnav MODULES += contrib/libbluray -MODULES += contrib/libmkv -MODULES += contrib/mp4v2 MODULES += contrib/mpeg2dec ifneq (,$(filter $(BUILD.system),mingw)) |