mkv soft subtitle support

- new libmkv 0.6.4 with subtitle track support
- muxmkv supports vobsub and closed caption subtitles
- added subtitle format, source, and dest initialization to dvdnav
- moved subtitle_force flag into hb_subtitle_t struct as it needs to
  be settable per subtitle
- gtk ui added subtitle tab which allows selection of multiple subtitles
- reorgainize subtitle sync code to prevent dropping of subtitles when
  multiple subtitles are enabled

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2428 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 4 insertions, 4 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 85431646d..250c8fef8 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2615,10 +2615,6 @@ fWorkingCount = 0;
     job->file = [[queueToApply objectForKey:@"DestinationPath"] UTF8String];
     //[self writeToActivityLog: "processNewQueueEncode sending to prepareJob"];
     [self prepareJob];
-    if( [[queueToApply objectForKey:@"SubtitlesForced"] intValue] == 1 )
-        job->subtitle_force = 1;
-    else
-        job->subtitle_force = 0;
     
     /*
      * If scanning we need to do some extra setup of the job.
@@ -3217,6 +3213,10 @@ fWorkingCount = 0;
         job->indepth_scan = 0;
         hb_subtitle_t *subtitle = (hb_subtitle_t *) hb_list_item( title->list_subtitle, 
                                                                   [[queueToApply objectForKey:@"JobSubtitlesIndex"] intValue] - 2 );
+        if( [[queueToApply objectForKey:@"SubtitlesForced"] intValue] == 1 )
+            subtitle->force = 1;
+        else
+            subtitle->force = 0;
         hb_list_add( job->list_subtitle, subtitle );
         break;
     }