diff options
| author | dynaflash <[email protected]> | 2011-07-19 17:49:19 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2011-07-19 17:49:19 +0000 |
| commit | 30a27fdddd3cf46a18ae1c0669cf74c994c12eb9 (patch) | |
| tree | 5724e0d1202034064fe522480cebd1e3829c9795 /macosx | |
| parent | 18286c6ba6c0cb57b3a1555730877af7fc46c24e (diff) | |
MacGUI: use "AC3 (ffmpeg)" to designate the ffac3 encoder (for consistency).
- Patch by Rodeo
- This patch switches the codec name from "AC3" to "AC3 (ffmpeg)" for consistency.
- Backwards-compatibility with old presets is handled by mapping "AC3" to "AC3 (ffmpeg)" when loading a preset.
- Referenced here https://reviews.handbrake.fr/r/155/
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBAudio.m | 2 | ||||
| -rw-r--r-- | macosx/HBAudioController.m | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index d5169d11d..e92e578e4 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -121,7 +121,7 @@ static NSMutableArray *masterBitRateArray = nil; [NSNumber numberWithInt: HB_ACODEC_AC3], keyAudioMustMatchTrack, nil]]; [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys: - NSLocalizedString(@"AC3", @"AC3"), keyAudioCodecName, + NSLocalizedString(@"AC3 (ffmpeg)", @"AC3 (ffmpeg)"), keyAudioCodecName, [NSNumber numberWithInt: HB_ACODEC_AC3], keyAudioCodec, [NSNumber numberWithBool: YES], keyAudioMP4, [NSNumber numberWithBool: YES], keyAudioMKV, diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index c350a80ac..ec9314697 100644 --- a/macosx/HBAudioController.m +++ b/macosx/HBAudioController.m @@ -304,10 +304,15 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; { if (![newAudio setCodecFromName: key]) { - [dict setObject: @"AC3" forKey: @"AudioEncoder"]; + [dict setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoder"]; fallenBack = YES; } } + if ([key isEqualToString: @"AC3"]) + { + [dict setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoder"]; + } + // If our preset does not contain a drc or gain value set it to a default of 0.0 if (![dict objectForKey: @"AudioTrackDRCSlider"]) |