Merge pull request #2567 from MediaBrowser/beta

Beta

1 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index 73be78dc9..30deae842 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -72,6 +72,9 @@ namespace MediaBrowser.Controller.MediaEncoding
         [ApiMember(Name = "EnableAutoStreamCopy", Description = "Whether or not to allow automatic stream copy if requested values match the original source. Defaults to true.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool EnableAutoStreamCopy { get; set; }
 
+        public bool AllowVideoStreamCopy { get; set; }
+        public bool AllowAudioStreamCopy { get; set; }
+
         /// <summary>
         /// Gets or sets the audio sample rate.
         /// </summary>
@@ -189,6 +192,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         public int? TranscodingMaxAudioChannels { get; set; }
         public int? CpuCoreLimit { get; set; }
         public string OutputContainer { get; set; }
+        public string LiveStreamId { get; set; }
 
         /// <summary>
         /// Gets or sets the video codec.
@@ -218,6 +222,8 @@ namespace MediaBrowser.Controller.MediaEncoding
         public BaseEncodingJobOptions()
         {
             EnableAutoStreamCopy = true;
+            AllowVideoStreamCopy = true;
+            AllowAudioStreamCopy = true;
             Context = EncodingContext.Streaming;
         }
     }