diff options
author | jstebbins <[email protected]> | 2010-05-24 21:53:48 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2010-05-24 21:53:48 +0000 |
commit | ddb445bf2829b7e6311a24453adc4a39b0215fb5 (patch) | |
tree | fb6b6b292b4707adfd6b5025fa9c0172e73097b8 /test/test.c | |
parent | 139cac98014fc013254bf6183513a50cd99fb874 (diff) |
add support for Nero vobsubs in mp4
Note that these do not work with any apple products that I know of. Perian
might be able to do something with them. MPlayer and VLC both grok nero
vobsubs.
libhb, cli, and lingui updated.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3325 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test/test.c')
-rw-r--r-- | test/test.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/test.c b/test/test.c index 30c9bfab2..dc37402c1 100644 --- a/test/test.c +++ b/test/test.c @@ -1792,18 +1792,10 @@ static int HandleEvents( hb_handle_t * h ) force = test_sub_list(subforce, token, pos); - if ( !burn && mux == HB_MUX_MKV && - subtitle->format == PICTURESUB) + if ( !burn && subtitle->format == PICTURESUB) { sub_config.dest = PASSTHRUSUB; } - else if (!burn && mux == HB_MUX_MP4 && - subtitle->format == PICTURESUB) - { - // Skip any non-burned vobsubs when output is mp4 - fprintf( stderr, "Warning: Skipping subtitle track %d, can't pass-through VOBSUBs in an MP4 container,\nadd '--subtitle-burn %d' to the command line\n", track+1, track+1 ); - continue; - } else if ( burn && subtitle->format == PICTURESUB ) { // Only allow one subtitle to be burned into video |