]> granicus.if.org Git - handbrake/commitdiff
MacGui: Fix Chapter Markers for MKV
authordynaflash <dynaflashtech@gmail.com>
Tue, 31 Jul 2007 20:19:57 +0000 (20:19 +0000)
committerdynaflash <dynaflashtech@gmail.com>
Tue, 31 Jul 2007 20:19:57 +0000 (20:19 +0000)
- changed old sanity check in -PrepareJob which limited it to just mp4

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

macosx/Controller.mm

index 8e3c1fc3b10af45666c399d676a53e4cd9979d5d..619a88416da2a6649d09da1a77d38389fb5182a5 100644 (file)
@@ -1245,17 +1245,7 @@ list = hb_get_titles( fHandle );
     /* If mpeg-4, then set mpeg-4 specific options like chapters and > 4gb file sizes */
        if ([fDstFormatPopUp indexOfSelectedItem] == 0)
        {
-        /* We set the chapter marker extraction here based on the format being
-               mpeg4 and the checkbox being checked */
-               if ([fCreateChapterMarkers state] == NSOnState)
-               {
-                       job->chapter_markers = 1;
-               }
-               else
-               {
-                       job->chapter_markers = 0;
-               }
-               /* We set the largeFileSize (64 bit formatting) variable here to allow for > 4gb files based on the format being
+        /* We set the largeFileSize (64 bit formatting) variable here to allow for > 4gb files based on the format being
                mpeg4 and the checkbox being checked 
                *Note: this will break compatibility with some target devices like iPod, etc.!!!!*/
                if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AllowLargeFiles"] > 0 && [fDstMpgLargeFileCheck state] == NSOnState)
@@ -1267,8 +1257,19 @@ list = hb_get_titles( fHandle );
                        job->largeFileSize = 0;
                }
        }
-       
-       
+       if ([fDstFormatPopUp indexOfSelectedItem] == 0 || [fDstFormatPopUp indexOfSelectedItem] == 3)
+       {
+         /* We set the chapter marker extraction here based on the format being
+               mpeg4 or mkv and the checkbox being checked */
+               if ([fCreateChapterMarkers state] == NSOnState)
+               {
+                       job->chapter_markers = 1;
+               }
+               else
+               {
+                       job->chapter_markers = 0;
+               }
+       }
        if( ( job->vcodec & HB_VCODEC_FFMPEG ) &&
         [fVidEncoderPopUp indexOfSelectedItem] > 0 )
     {