Merge pull request #2639 from alset333/master

Change DeinterlaceMethod's "bobandweave" to "yadif" or "yadif_bob", and set default value

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -2005,7 +2005,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var inputFramerate = videoStream?.RealFrameRate;
 
                 // If it is already 60fps then it will create an output framerate that is much too high for roku and others to handle
-                if (string.Equals(options.DeinterlaceMethod, "bobandweave", StringComparison.OrdinalIgnoreCase) && (inputFramerate ?? 60) <= 30)
+                if (string.Equals(options.DeinterlaceMethod, "yadif_bob", StringComparison.OrdinalIgnoreCase) && (inputFramerate ?? 60) <= 30)
                 {
                     filters.Add("yadif=1:-1:0");
                 }

MediaBrowser.Model/Configuration/EncodingOptions.cs

@@ -40,6 +40,7 @@ namespace MediaBrowser.Model.Configuration
             VaapiDevice = "/dev/dri/renderD128";
             H264Crf = 23;
             H265Crf = 28;
+            DeinterlaceMethod = "yadif";
             EnableHardwareEncoding = true;
             EnableSubtitleExtraction = true;
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };