From 6e89ca9a343fb3ca7676d5d00f05aa0339447434 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Thu, 25 Mar 2021 17:00:32 +0100 Subject: Merge pull request #5620 from MrTimscampi/iso-ignore (cherry picked from commit a76d997a86b07f38ad1e7f168f11d2de6423d545) Signed-off-by: Joshua M. Boniface --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs') diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index fa9222023..8a5380be6 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; } -- cgit v1.2.3