Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5620 from MrTimscampi/iso-ignore

Browse Source
This commit is contained in:
Claus Vium 2021-03-25 17:00:32 +01:00 committed by GitHub
commit a76d997a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
View File

@ -82,11 +82,6 @@ namespace Emby.Server.Implementations.MediaEncoder
return false; return false;
} }
if (video.VideoType == VideoType.Dvd)
{
return false;
}
if (video.IsShortcut) if (video.IsShortcut)
{ {
return false; return false;

6
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -313,6 +313,12 @@ namespace MediaBrowser.Controller.MediaEncoding
return null; return null;
} }
// ISO files don't have an ffmpeg format
if (string.Equals(container, "iso", StringComparison.OrdinalIgnoreCase))
{
return null;
}
return container; return container;
} }

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -370,7 +370,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public string GetInputArgument(string inputFile, MediaSourceInfo mediaSource) public string GetInputArgument(string inputFile, MediaSourceInfo mediaSource)
{ {
var prefix = "file"; var prefix = "file";
if (mediaSource.VideoType == VideoType.BluRay || mediaSource.VideoType == VideoType.Iso) if (mediaSource.VideoType == VideoType.BluRay)
{ {
prefix = "bluray"; prefix = "bluray";
} }