summaryrefslogtreecommitdiffstats
path: root/win/CS/Functions
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-04-18 20:47:02 +0000
committersr55 <[email protected]>2011-04-18 20:47:02 +0000
commitd0d06731c765a1a4c43558639405533d2af088b7 (patch)
treeb1becf16be4d6ff51300ca36a6191679b04503ca /win/CS/Functions
parente63f490b2e0a90bafb690e1d1f1f1e2f44729309 (diff)
WinGui:
- added mpeg2 option to the encoders list. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3938 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/Functions')
-rw-r--r--win/CS/Functions/PresetLoader.cs10
-rw-r--r--win/CS/Functions/QueryGenerator.cs4
2 files changed, 11 insertions, 3 deletions
diff --git a/win/CS/Functions/PresetLoader.cs b/win/CS/Functions/PresetLoader.cs
index 78965f1f9..b3c213469 100644
--- a/win/CS/Functions/PresetLoader.cs
+++ b/win/CS/Functions/PresetLoader.cs
@@ -196,14 +196,17 @@ namespace Handbrake.Functions
switch (presetQuery.VideoEncoder)
{
case VideoEncoder.X264:
- mainWindow.drp_videoEncoder.SelectedIndex = 1;
+ mainWindow.drp_videoEncoder.SelectedIndex = 0;
break;
case VideoEncoder.FFMpeg:
- mainWindow.drp_videoEncoder.SelectedIndex = 0;
+ mainWindow.drp_videoEncoder.SelectedIndex = 1;
break;
- case VideoEncoder.Theora:
+ case VideoEncoder.FFMpeg2:
mainWindow.drp_videoEncoder.SelectedIndex = 2;
break;
+ case VideoEncoder.Theora:
+ mainWindow.drp_videoEncoder.SelectedIndex = 3;
+ break;
}
// Quality
@@ -299,6 +302,7 @@ namespace Handbrake.Functions
switch (videoEncoder)
{
case VideoEncoder.FFMpeg:
+ case VideoEncoder.FFMpeg2:
sliderValue = 32 - (int)value;
break;
case VideoEncoder.X264:
diff --git a/win/CS/Functions/QueryGenerator.cs b/win/CS/Functions/QueryGenerator.cs
index 5487e7b00..975a2a5c3 100644
--- a/win/CS/Functions/QueryGenerator.cs
+++ b/win/CS/Functions/QueryGenerator.cs
@@ -302,6 +302,9 @@ namespace Handbrake.Functions
case "MPEG-4 (FFmpeg)":
query += " -e ffmpeg";
break;
+ case "MPEG-2 (FFmpeg)":
+ query += " -e ffmpeg2";
+ break;
case "H.264 (x264)":
query += " -e x264";
break;
@@ -325,6 +328,7 @@ namespace Handbrake.Functions
switch (mainWindow.drp_videoEncoder.Text)
{
case "MPEG-4 (FFmpeg)":
+ case "MPEG-2 (FFmpeg)":
value = 31 - (mainWindow.slider_videoQuality.Value - 1);
query += " -q " + value.ToString(new CultureInfo("en-US"));
break;