improve cancellation support of auto-organize

1 files changed, 10 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 530ff1343..dd31d39b1 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -743,6 +743,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
         {
+            if (!videoStream.AllowStreamCopy)
+            {
+                return false;
+            }
+
             var request = state.BaseRequest;
 
             if (videoStream.IsInterlaced)
@@ -883,6 +888,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
         {
+            if (!audioStream.AllowStreamCopy)
+            {
+                return false;
+            }
+
             var request = state.BaseRequest;
 
             // Source and target codecs must match