summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs6
-rw-r--r--win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs2
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;