diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-09-25 15:15:01 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-09-25 15:15:01 -0400 |
| commit | d43508a8989240aabdad7225073e0231f5634380 (patch) | |
| tree | 2ecc608d91b695ecbb3809b76a695940fd3daca3 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | ab8c0bf1e6a3b29f9ff0c6037bd29301e69f1ac7 (diff) | |
update applyconditions
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 7be3c3754..368c0cf32 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1367,7 +1367,8 @@ namespace MediaBrowser.Controller.MediaEncoding if (state.DeInterlace("h264") && !string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase)) { - if (string.Equals(options.DeinterlaceMethod, "bobandweave", StringComparison.OrdinalIgnoreCase)) + // 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) && (state.VideoStream.RealFrameRate ?? 60) <= 30) { filters.Add("yadif=1:-1:0"); } |