summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Functions
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-06-11 17:24:43 +0000
committersr55 <[email protected]>2011-06-11 17:24:43 +0000
commit708c792ed6f40ce4a46af0e95dec32798e460570 (patch)
tree8ccd96aa3fcaa1bef7e8fe49651cd1b0f78208bf /win/CS/HandBrake.ApplicationServices/Functions
parentc2d584cfe459995bcbe73952581a89caa0be6e07 (diff)
WinGui: Added support for the new ffmpeg aac encoder.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4041 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Functions')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Functions/Converters.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
index 2259abb8c..c973128d6 100644
--- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
@@ -140,6 +140,8 @@ namespace HandBrake.ApplicationServices.Functions
return "AC3 Passthru";
case "copy:dts":
return "DTS Passthru";
+ case "ffaac":
+ return "AAC (ffmpeg)";
default:
return "AAC (faac)";
}
@@ -156,6 +158,8 @@ namespace HandBrake.ApplicationServices.Functions
{
case "faac":
return AudioEncoder.Faac;
+ case "ffaac":
+ return AudioEncoder.ffaac;
case "lame":
return AudioEncoder.Lame;
case "vorbis":
@@ -182,6 +186,8 @@ namespace HandBrake.ApplicationServices.Functions
{
case "AAC (faac)":
return AudioEncoder.Faac;
+ case "AAC (ffmpeg)":
+ return AudioEncoder.ffaac;
case "AAC (CoreAudio)":
return AudioEncoder.Faac;
case "MP3 (lame)":
@@ -214,6 +220,8 @@ namespace HandBrake.ApplicationServices.Functions
{
case AudioEncoder.Faac:
return "faac";
+ case AudioEncoder.ffaac:
+ return "ffaac";
case AudioEncoder.Lame:
return "lame";
case AudioEncoder.Vorbis:
@@ -224,6 +232,7 @@ namespace HandBrake.ApplicationServices.Functions
return "copy:dts";
case AudioEncoder.Ac3:
return "ac3";
+
default:
return "faac";
}