summaryrefslogtreecommitdiffstats
path: root/win/C#/Functions
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-10-10 14:12:22 +0000
committersr55 <[email protected]>2010-10-10 14:12:22 +0000
commit8019891f41076f6eb1f2ed6ae535103b392662e2 (patch)
tree2d8ba5771ea46fa6c52adb9c63e1b0b38dfed659 /win/C#/Functions
parent5f381b10a35af1530f2711cd23b3445cbf3d1470 (diff)
WinGui:
- Add support for the new AC3 Encoder. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3595 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
-rw-r--r--win/C#/Functions/QueryGenerator.cs6
-rw-r--r--win/C#/Functions/QueryParser.cs6
2 files changed, 8 insertions, 4 deletions
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 2c4706f71..0703b65ba 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -597,9 +597,11 @@ namespace Handbrake.Functions
case "Vorbis (vorbis)":
return "vorbis";
case "AC3 Passthru":
- return "ac3";
+ return "copy:ac3";
case "DTS Passthru":
- return "dts";
+ return "copy:dts";
+ case "AC3 (ffmpeg)":
+ return "ac3";
default:
return string.Empty;
}
diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index c4ea1e5c9..01344c83c 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -353,7 +353,7 @@ namespace Handbrake.Functions
Match noAudio = Regex.Match(input, @"-a none");
Match audioTracks = Regex.Match(input, @"-a ([0-9,]*)");
Match audioTrackMixes = Regex.Match(input, @"-6 ([0-9a-zA-Z,]*)");
- Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,]*)");
+ Match audioEncoders = Regex.Match(input, @"-E ([a-zA-Z0-9+,:]*)");
Match audioBitrates = Regex.Match(input, @"-B ([0-9a-zA-Z,]*)"); // Auto = a-z
Match audioSampleRates = Regex.Match(input, @"-R ([0-9a-zA-Z.,]*)"); // Auto = a-z
Match drcValues = Regex.Match(input, @"-D ([0-9.,]*)");
@@ -688,8 +688,10 @@ namespace Handbrake.Functions
case "vorbis":
return "Vorbis (vorbis)";
case "ac3":
+ return "AC3 (ffmpeg)";
+ case "copy:ac3":
return "AC3 Passthru";
- case "dts":
+ case "copy:dts":
return "DTS Passthru";
default:
return "AAC (faac)";