diff options
| author | sr55 <[email protected]> | 2013-09-14 17:21:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-09-14 17:21:24 +0000 |
| commit | 1e73f743a8463ef70126d7b6b094f6ccc74c971e (patch) | |
| tree | 222e622918ba64c2971a002502a5e15bdc2e3852 /win/CS/HandBrake.ApplicationServices/Utilities | |
| parent | 9280ff47e6e179f9e3f4568f85bae362402a82f4 (diff) | |
WinGui: Remove the AV_MP4 option so we now only have the AV Format Muxer as "MP4 File". The AV_MKV option will be removed at a later date.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5781 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Utilities')
5 files changed, 3 insertions, 9 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs index 4e48c4f0f..b3f46f8a1 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs @@ -445,9 +445,9 @@ namespace HandBrake.ApplicationServices.Utilities switch (format.ToLower())
{
default:
- return OutputFormat.av_mp4;
+ return OutputFormat.Mp4;
case "m4v":
- return OutputFormat.av_mp4;
+ return OutputFormat.Mp4;
case "mkv":
return OutputFormat.av_mkv;
}
@@ -468,7 +468,7 @@ namespace HandBrake.ApplicationServices.Utilities {
default:
return "mp4";
- case OutputFormat.av_mp4:
+ case OutputFormat.Mp4:
return "m4v";
case OutputFormat.av_mkv:
return "mkv";
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs index d5bcb930e..b6a50485f 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs @@ -99,7 +99,6 @@ namespace HandBrake.ApplicationServices.Utilities profile.IPod5GSupport = work.IPod5GSupport;
profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
profile.KeepDisplayAspect = work.KeepDisplayAspect;
- profile.LargeFile = work.LargeFile;
profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;
profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;
profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs index 420717dfa..f034cb682 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs @@ -139,7 +139,6 @@ namespace HandBrake.ApplicationServices.Utilities AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4 || parsed.OutputFormat == OutputFormat.M4V) ? "MP4 file" : "MKV file");
AddBooleanElement(xmlWriter, "Folder", false);
AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");
- AddEncodeElement(xmlWriter, "Mp4LargeFile", "integer", parsed.LargeFile ? "1" : "0");
AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");
AddEncodeElement(xmlWriter, "PictureAutoCrop", "integer", "1");
AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index af0e086f9..9e38d15d9 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -234,9 +234,6 @@ namespace HandBrake.ApplicationServices.Utilities query += string.Format(" -f {0} ", EnumHelper<Enum>.GetDescription(task.OutputFormat).ToLower());
// These are output settings features
- if (task.LargeFile)
- query += " -4 ";
-
if (task.IPod5GSupport)
query += " -I ";
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs index eae37e2b5..db92b3504 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs @@ -152,7 +152,6 @@ namespace HandBrake.ApplicationServices.Utilities {
parsed.OutputFormat = Converters.GetFileFormat(format.Groups[1].ToString());
}
- parsed.LargeFile = largerMp4.Success;
parsed.IPod5GSupport = ipodAtom.Success;
parsed.OptimizeMP4 = optimizeMP4.Success;
|