summaryrefslogtreecommitdiffstats
path: root/make/include
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-06-30 20:44:21 +0000
committerjstebbins <[email protected]>2013-06-30 20:44:21 +0000
commitba3674603258b9bd9662af2b8f2225f9e9395ca1 (patch)
tree69cf3e5d77d21f07a57554ae5d1dd2bfa78e7f8b /make/include
parentd6fcba15d04322d3b6495cae70b813be5c3243b4 (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/include')
-rw-r--r--make/include/main.defs10
1 files changed, 8 insertions, 2 deletions
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))