aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/LiveTv
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-09-17 13:04:35 -0400
committerGitHub <noreply@github.com>2017-09-17 13:04:35 -0400
commit3cc6c739c92a7ed2402a91ceab5fa9aa90c00322 (patch)
tree098babece940e894ab3c13c114c622cf43edabc4 /Emby.Server.Implementations/LiveTv
parentf1fcc6e9c4dca4097d9cc4db40b03a02bd0ef8d5 (diff)
parent7c65dfa68214cfe40bb9104c7ba8b2c2dd8f59d8 (diff)
Merge pull request #2887 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
-rw-r--r--Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 48eba4117b..149f69e5b3 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -284,8 +284,15 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
protected string GetOutputSizeParam()
{
var filters = new List<string>();
-
- filters.Add("yadif=0:-1:0");
+
+ if (string.Equals(GetEncodingOptions().DeinterlaceMethod, "bobandweave", StringComparison.OrdinalIgnoreCase))
+ {
+ filters.Add("yadif=1:-1:0");
+ }
+ else
+ {
+ filters.Add("yadif=0:-1:0");
+ }
var output = string.Empty;