Merge remote-tracking branch 'upstream/master' into client-logger

1 files changed, 23 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/TranscodingJobType.cs b/MediaBrowser.Controller/MediaEncoding/TranscodingJobType.cs
new file mode 100644
index 000000000..66b628371
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/TranscodingJobType.cs
@@ -0,0 +1,23 @@
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    /// <summary>
+    /// Enum TranscodingJobType.
+    /// </summary>
+    public enum TranscodingJobType
+    {
+        /// <summary>
+        /// The progressive.
+        /// </summary>
+        Progressive,
+
+        /// <summary>
+        /// The HLS.
+        /// </summary>
+        Hls,
+
+        /// <summary>
+        /// The dash.
+        /// </summary>
+        Dash
+    }
+}
\ No newline at end of file