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 /libhb/module.defs | |
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 'libhb/module.defs')
-rw-r--r-- | libhb/module.defs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index 9f5e46795..49df1b28f 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -46,6 +46,15 @@ endif ifeq (1,$(FEATURE.faac)) LIBHB.GCC.D += USE_FAAC endif +ifeq (1,$(FEATURE.mp4v2)) +LIBHB.GCC.D += USE_MP4V2 +endif +ifeq (1,$(FEATURE.libmkv)) +LIBHB.GCC.D += USE_LIBMKV +endif +ifeq (1,$(FEATURE.avformat)) +LIBHB.GCC.D += USE_AVFORMAT +endif LIBHB.GCC.D += __LIBHB__ USE_PTHREAD LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include @@ -102,7 +111,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ a52 ass avcodec avformat avutil avresample dvdnav dvdread \ - fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + fontconfig freetype mpeg2 mp3lame \ ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) @@ -114,6 +123,14 @@ ifeq (1,$(FEATURE.faac)) LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a endif +ifeq (1,$(FEATURE.mp4v2)) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libmp4v2.a +endif + +ifeq (1,$(FEATURE.libmkv)) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libmkv.a +endif + ifneq ($(HAS.iconv),1) LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a else |