diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-25 15:18:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 15:18:05 -0400 |
| commit | f114b103da4aeb43c3c13cc5033f695e7acadb1e (patch) | |
| tree | b06e6341a50db16f1bb3347c9868a8265ad306af /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 88d62050a6a16ce5b9c093501d9a4dc4ce4f62c9 (diff) | |
| parent | 099b823f2f65f24216a511e2fc8f6e20c36bd2d0 (diff) | |
Merge pull request #2915 from MediaBrowser/dev
Dev
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"); } |