aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorClaus Vium <cvium@users.noreply.github.com>2021-03-25 17:00:32 +0100
committerGitHub <noreply@github.com>2021-03-25 17:00:32 +0100
commita76d997a86b07f38ad1e7f168f11d2de6423d545 (patch)
tree8bcbc4251d6a55d8cce8fad98d521e89c2c81aec /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent6d0b2ed0800dbaabfd7cf79b47e9a37cd7d6eb00 (diff)
parent5bb7d99b48feb66a393da73f4a056b6dd5f38739 (diff)
Merge pull request #5620 from MrTimscampi/iso-ignore
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 09080e7b2..92b9a8c7e 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -313,6 +313,12 @@ namespace MediaBrowser.Controller.MediaEncoding
return null;
}
+ // ISO files don't have an ffmpeg format
+ if (string.Equals(container, "iso", StringComparison.OrdinalIgnoreCase))
+ {
+ return null;
+ }
+
return container;
}