Fix missing commas and merge defects

nyanmisaka · May 26, 2020 · 6287349 · 6287349
1 parent 3c82379
commit 6287349
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -475,9 +475,6 @@ public string GetInputArgument(EncodingJobInfo state, EncodingOptions encodingOp
             if (state.IsVideoRequest
                 && string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
             {
-                var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
-                var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
-
                 var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
 
                 if (!hasTextSubs)

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -45,7 +45,7 @@ public class EncoderValidator
             "mpeg2_mediacodec",
             "mpeg4_mediacodec",
             "vp8_mediacodec",
-            "vp9_mediacodec"
+            "vp9_mediacodec",
             "h264_videotoolbox",
             "hevc_videotoolbox",
             "mpeg2_videotoolbox",
@@ -80,8 +80,8 @@ public class EncoderValidator
             "hevc_vaapi",
             "h264_omx",
             "hevc_omx",
-            "h264_v4l2m2m"
-            "h264_videotoolbox"
+            "h264_v4l2m2m",
+            "h264_videotoolbox",
             "hevc_videotoolbox"
         };
 

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -258,7 +258,7 @@ public void SetAvailableDecoders(IEnumerable<string> list)
             //_logger.Info("Supported decoders: {0}", string.Join(",", list.ToArray()));
         }
 
-        private List<string> _hwaccels = Array.Empty<string>();
+        private List<string> _hwaccels = new List<string>();
         public void SetAvailableHwaccels(IEnumerable<string> list)
         {
             _hwaccels = list.ToList();