aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-25 13:52:15 -0400
committerLuke <luke.pulverenti@gmail.com>2016-03-25 13:52:15 -0400
commit72fe76ab1008f0bd38157cc37cde45797b5f6417 (patch)
tree875b6bee7d0a634d7ef019cfb7c434823b223001 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parent736e63241011cb9ae798bf4091cd37e097045c21 (diff)
parentf6c18200bacae6e768225a8c073418a170d349bd (diff)
Merge pull request #1593 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 8d1b4057b..934fbc18f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -293,10 +293,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
var formats = (video.Container ?? string.Empty).Split(',').ToList();
- var enableInterlacedDection = formats.Contains("vob", StringComparer.OrdinalIgnoreCase) &&
- formats.Contains("m2ts", StringComparer.OrdinalIgnoreCase) &&
- formats.Contains("ts", StringComparer.OrdinalIgnoreCase) &&
- formats.Contains("mpegts", StringComparer.OrdinalIgnoreCase) &&
+ var enableInterlacedDection = formats.Contains("vob", StringComparer.OrdinalIgnoreCase) ||
+ formats.Contains("m2ts", StringComparer.OrdinalIgnoreCase) ||
+ formats.Contains("ts", StringComparer.OrdinalIgnoreCase) ||
+ formats.Contains("mpegts", StringComparer.OrdinalIgnoreCase) ||
formats.Contains("wtv", StringComparer.OrdinalIgnoreCase);
// If it's mpeg based, assume true