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

1 files changed, 4 insertions, 1 deletions

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;