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 /test | |
| 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 'test')
| -rw-r--r-- | test/module.defs | 10 | ||||
| -rw-r--r-- | test/test.c | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/module.defs b/test/module.defs index 2150ed906..590c49ea2 100644 --- a/test/module.defs +++ b/test/module.defs @@ -15,7 +15,7 @@ TEST.libs = $(LIBHB.a) TEST.GCC.l = \ a52 ass avcodec avformat avutil avresample dvdnav dvdread \ - fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \ + fontconfig freetype fribidi mpeg2 mp3lame ogg \ samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \ bluray xml2 bz2 z @@ -27,6 +27,14 @@ ifeq (1,$(FEATURE.faac)) TEST.GCC.l += faac endif +ifeq (1,$(FEATURE.mp4v2)) +TEST.GCC.l += mp4v2 +endif + +ifeq (1,$(FEATURE.libmkv)) +TEST.GCC.l += mkv +endif + TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) ############################################################################### diff --git a/test/test.c b/test/test.c index aaa68045e..e76258977 100644 --- a/test/test.c +++ b/test/test.c @@ -2712,7 +2712,7 @@ static int HandleEvents( hb_handle_t * h ) } sub_config = subtitle->config; - if( mux == HB_MUX_MKV || subtitle->format == TEXTSUB) + if ((mux & HB_MUX_MASK_MKV) || subtitle->format == TEXTSUB) { sub_config.dest = PASSTHRUSUB; } |