aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-01-24 01:14:24 -0500
committerGitHub <noreply@github.com>2017-01-24 01:14:24 -0500
commitd4e267a62d949905cf91a0d74b80566a8a2957a6 (patch)
tree719702f0c9bde0c0eb899a0b4539eae6126192b1 /MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
parent7abbdfb7680bb0d81c5a334df2284122cac48891 (diff)
parent2ebcbdece8ad941e3a4d95000c1071c1e1ad81ab (diff)
Merge pull request #2414 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index c16d3afbd..0273f2753 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -47,6 +47,8 @@ namespace MediaBrowser.MediaEncoding.Probing
info.MediaStreams = internalStreams.Select(s => GetMediaStream(isAudio, s, data.format))
.Where(i => i != null)
+ // Drop subtitle streams if we don't know the codec because it will just cause failures if we don't know how to handle them
+ .Where(i => i.Type != MediaStreamType.Subtitle || !string.IsNullOrWhiteSpace(i.Codec))
.ToList();
if (data.format != null)