diff options
| author | jstebbins <[email protected]> | 2015-02-25 16:12:13 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-02-25 16:12:13 +0000 |
| commit | df99e1727fd3f72f0a418f0634afcd58fdec997a (patch) | |
| tree | 2642e27e06630417db667c0fa0e2445877f9543c /libhb | |
| parent | 6233eab0440e79454449b67b2aa97dda6b5379d4 (diff) | |
muxavformat: only set subtitle "forced" flag when *user* sets default track
Forced shouldn't be set when hb chooses a default track for mp4, which we
do for quicktime compatibility.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6944 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/muxavformat.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index 389277319..44993c27c 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -774,10 +774,13 @@ static int avformatInit( hb_mux_object_t * m ) track->st->codec->extradata = priv_data; track->st->codec->extradata_size = priv_size; - if ( ii == subtitle_default ) + if (ii == subtitle_default) { - track->st->disposition |= AV_DISPOSITION_DEFAULT | - AV_DISPOSITION_FORCED; + track->st->disposition |= AV_DISPOSITION_DEFAULT; + } + if (subtitle->config.default_track) + { + track->st->disposition |= AV_DISPOSITION_FORCED; } lang = lookup_lang_code(job->mux, subtitle->iso639_2 ); |