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, 3 insertions, 5 deletions

diff --git a/test/test.c b/test/test.c
index 3fecfb1cc..44e44d14f 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1655,6 +1655,9 @@ static int HandleEvents( hb_handle_t * h )
                  */
                 subtitle = hb_list_item( title->list_subtitle, sub-1 );
                 if( subtitle ) {
+                    if( subtitle_force ) {
+                        subtitle->force = subtitle_force;
+                    }
                     hb_list_add( job->list_subtitle, subtitle );
                 } else {
                     fprintf( stderr, "Could not find subtitle track %d, skipped\n", sub );
@@ -1709,11 +1712,6 @@ static int HandleEvents( hb_handle_t * h )
             if (maxHeight)
                 job->maxHeight = maxHeight;
 
-            if( subtitle_force )
-            {
-                job->subtitle_force = subtitle_force;
-            }
-
             if( start_at_preview )
             {
                 job->start_at_preview = start_at_preview - 1;