diff options
| author | sr55 <[email protected]> | 2012-09-07 21:05:02 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-09-07 21:05:02 +0000 |
| commit | ee6967a926c3f735123357f6db06bdb14a6b9ab9 (patch) | |
| tree | dc600d91d0939e15947abad7f00da76e513ee1b6 /win | |
| parent | e35e2bce468fdf5a00b5ac42f18cd4115f5ab045 (diff) | |
WinGui: Make sure new Mixdowns get appropriate bitrate selections for aac
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4936 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs | 6 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs index ff5d5828e..b0ddff959 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs @@ -19,6 +19,9 @@ namespace HandBrake.Interop.Model.Encoding [Display(Name = "Dolby Pro Logic II")]
DolbyProLogicII = 0,
+ [Display(Name = "None")]
+ None,
+
[Display(Name = "Automatic")]
Auto,
@@ -48,8 +51,5 @@ namespace HandBrake.Interop.Model.Encoding [Display(Name = "7.1 (5F/2R/LFE)")]
Five_2_LFE,
-
- [Display(Name = "None")]
- None,
}
}
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs index 9eb4253ad..28e31b07d 100644 --- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs @@ -53,7 +53,7 @@ namespace HandBrakeWPF.Converters.Audio {
case AudioEncoder.Faac:
case AudioEncoder.ffaac:
- max = track.MixDown == Mixdown.FivePoint1Channels ? 768 : 320;
+ max = track.MixDown >= Mixdown.FivePoint1Channels ? 768 : 320;
break;
case AudioEncoder.Lame:
max = 320;
|