diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2021-03-25 17:00:32 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2021-04-11 14:13:44 -0400 |
| commit | 6e89ca9a343fb3ca7676d5d00f05aa0339447434 (patch) | |
| tree | fcf6a8cfa87affe1c4a9fa6a5a42578065227b4c /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | de1896828fd274c553ea1276360388bd5f834112 (diff) | |
Merge pull request #5620 from MrTimscampi/iso-ignore
(cherry picked from commit a76d997a86b07f38ad1e7f168f11d2de6423d545)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |