diff options
author | dynaflash <[email protected]> | 2007-09-18 17:58:23 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2007-09-18 17:58:23 +0000 |
commit | 9b1a00e83f2d90913fc6470df98e1849f883c0cf (patch) | |
tree | 2c794f8b1cfd1850d3f6fa55aebd1805b82a8cd8 | |
parent | 409658778b6f19164763fd77429597b7bb791926 (diff) |
MacGui: Add conditional to 6 channel vorbis to remove < 192 bitrates from popup, since vorbis crashes in a fiery wreck.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@972 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r-- | macosx/Controller.mm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index e698a0ee9..6cf95624c 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -2621,11 +2621,22 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It break; case HB_ACODEC_VORBIS: + if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH || [[fAudTrack2MixPopUp selectedItem] tag] == HB_AMIXDOWN_6CH) + { + /* Vorbis causes a crash if we use a bitrate below 192 kbps with 6 channel */ + minbitrate = 192; + /* If either mixdown popup includes 6-channel discrete, then allow up to 384 kbps */ + maxbitrate = 384; + break; + } + else + { /* Vorbis causes a crash if we use a bitrate below 48 kbps */ minbitrate = 48; /* Vorbis can cope with 384 kbps quite happily, even for stereo */ maxbitrate = 384; break; + } default: /* AC3 passthru disables the bitrate dropdown anyway, so we might as well just use the min and max bitrate */ |