diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-13 01:47:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 01:47:50 -0400 |
| commit | 7619ff7db543df3d8228aa87aa82a544e8dda54f (patch) | |
| tree | 79aba09ffadbaefc52986b45eeaae78d1b883771 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 526dea4f6fad60626aa4eb6b8560a4f00ec52351 (diff) | |
| parent | 2f06bb5bf52dc4dfc3d1763488d215a7e352a1fc (diff) | |
Merge pull request #2951 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index e7c768c3b..bddafe9a6 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -794,11 +794,6 @@ namespace MediaBrowser.Controller.MediaEncoding return false; } - if (state.EnableMpDecimate) - { - return false; - } - if (videoStream.IsInterlaced) { if (state.DeInterlace(videoStream.Codec, false)) @@ -1515,11 +1510,6 @@ namespace MediaBrowser.Controller.MediaEncoding } } - if (state.EnableMpDecimate) - { - filters.Add("mpdecimate,setpts=N/FRAME_RATE/TB"); - } - if (filters.Count > 0) { output += string.Format(" -vf \"{0}\"", string.Join(",", filters.ToArray())); |
