diff options
author | dynaflash <[email protected]> | 2007-07-31 20:19:57 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2007-07-31 20:19:57 +0000 |
commit | 4b0a34de39e4669bbf2a7d395d389205db0856c9 (patch) | |
tree | 10f79b4bf7f98d280ce8b164ea26db38a3fe15b2 /macosx/Controller.mm | |
parent | 826e13fc8e676c53bcd6f65352a9bdad8e2661bd (diff) |
MacGui: Fix Chapter Markers for MKV
- 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
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r-- | macosx/Controller.mm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 8e3c1fc3b..619a88416 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -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 ) { |