diff options
| author | sr55 <[email protected]> | 2008-02-16 23:09:40 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-02-16 23:09:40 +0000 |
| commit | 0427e21b2d4cc0790c95b7bc2ecc96ec8459f922 (patch) | |
| tree | 27fde3ec48511a32896de3c1919e618814c5a7fd /win/C#/Functions | |
| parent | 2bcb31df7b9308e3c1aa6f067d3fd8cf75772a93 (diff) | |
WinGui:
- Added aac+ac3 option to the audio codec dropdown. Mixdown gets disabled when this is selected.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1273 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
| -rw-r--r-- | win/C#/Functions/Common.cs | 3 | ||||
| -rw-r--r-- | win/C#/Functions/QueryParser.cs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index 7778fcb16..1f938a0f9 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -386,6 +386,9 @@ namespace Handbrake.Functions case "AC3":
audioEncoder = " -E ac3";
break;
+ case "AAC + AC3":
+ audioEncoder = " -E aac+ac3";
+ break;
default:
audioEncoder = " -E faac";
break;
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 9418aaf77..bc01a53fa 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -584,7 +584,7 @@ namespace Handbrake.Functions Match width = Regex.Match(input, @"-w ([0-9]*)");
Match height = Regex.Match(input, @"-l ([0-9]*)");
Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]*)");
- Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9]*)");
+ Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");
//Picture Settings Tab
Match deinterlace = Regex.Match(input, @"--deinterlace=([a-z]*)");
@@ -705,6 +705,9 @@ namespace Handbrake.Functions case "ac3":
audioEncoderConvertion = "AC3";
break;
+ case "aac+ac3":
+ audioEncoderConvertion = "AAC + AC3";
+ break;
default:
audioEncoderConvertion = "AAC";
break;
|