summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Model
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-07-16 16:05:36 +0000
committersr55 <[email protected]>2011-07-16 16:05:36 +0000
commit8b4dcce5fc1905a5d8facdda89f3e133889a0622 (patch)
tree3f17630d7935f4b9ff0fdf0f339b1d8c6dc2cc31 /win/CS/HandBrake.ApplicationServices/Model
parent5045c6feeec292db6b538bfe4363c1e3790997fb (diff)
WinGui: Some fixes to the Queue Current encoding information display and removal of another duplicate model.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4111 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs1
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncoder.cs27
2 files changed, 0 insertions, 28 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 430700ee1..2113c8605 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -13,7 +13,6 @@ namespace HandBrake.ApplicationServices.Model
using Anamorphic = HandBrake.ApplicationServices.Model.Encoding.Anamorphic;
using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
- using VideoEncoder = HandBrake.ApplicationServices.Model.Encoding.VideoEncoder;
/// <summary>
/// An Encode Task
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncoder.cs
deleted file mode 100644
index 766fa09aa..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncoder.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/* VideoEncoder.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices.Model.Encoding
-{
- using System.ComponentModel;
-
- /// <summary>
- /// The Video Encoder
- /// </summary>
- public enum VideoEncoder
- {
- [Description("H.264 (x264)")]
- X264 = 0,
-
- [Description("MPEG-4 (FFMpeg)")]
- FFMpeg,
-
- [Description("MPEG-2 (FFMpeg)")]
- FFMpeg2,
-
- [Description("VP3 (Theora)")]
- Theora
- }
-}