summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Model
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-07-13 17:21:48 +0000
committersr55 <[email protected]>2013-07-13 17:21:48 +0000
commit00b5d615c59958cb0078a6d3d8a126337335b734 (patch)
tree49926a033d2e50f57ac34512efcd1fb207668bc9 /win/CS/HandBrake.ApplicationServices/Model
parent1126b3488c02e40bf3426e35de26c420c20a3e76 (diff)
WinGui: Make the AVFormat Muxers default.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5646 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs8
2 files changed, 8 insertions, 2 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 0ea8dd8ba..9e57ef03a 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -467,7 +467,7 @@ namespace HandBrake.ApplicationServices.Model
{
get
{
- if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)
+ if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4 || this.OutputFormat == OutputFormat.av_mp4)
{
bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough ||
item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index 813418264..2303e786d 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
@@ -23,6 +23,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding
M4V,
[Description("MKV")]
- Mkv
+ Mkv,
+
+ [Description("av_mkv")]
+ av_mkv,
+
+ [Description("av_mp4")]
+ av_mp4,
}
}