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

diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 3892773198dbacdbdde5c8e9e8dafc9064fdb318..44993c27ca508ad8dd44287ed3fa040ba02473df 100644 (file)
--- 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 );