diff options
| author | Bond-009 <bond.009@outlook.com> | 2024-02-14 11:24:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 11:24:35 +0100 |
| commit | 0bf1c10c443c4763143e37fa9dce269c4e5cbad9 (patch) | |
| tree | 8fb4346d64399d4eb3ca502ddda7e53e0161b106 /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | c7d986fb430550deef8d7a2722763bb784ebaea8 (diff) | |
| parent | 9230472056ea92a54a3f47bcb10142310ae0200e (diff) | |
Merge pull request #10990 from Shadowghost/bdmv-fixes
BDMV fixes
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index e6c319869..b3029d6fa 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -458,10 +458,8 @@ public class VideosController : BaseJellyfinApiController return BadRequest($"Input protocol {state.InputProtocol} cannot be streamed statically"); } - var outputPath = state.OutputFilePath; - // Static stream - if (@static.HasValue && @static.Value) + if (@static.HasValue && @static.Value && !(state.MediaSource.VideoType == VideoType.BluRay || state.MediaSource.VideoType == VideoType.Dvd)) { var contentType = state.GetMimeType("." + state.OutputContainer, false) ?? state.GetMimeType(state.MediaPath); @@ -478,7 +476,7 @@ public class VideosController : BaseJellyfinApiController // Need to start ffmpeg (because media can't be returned directly) var encodingOptions = _serverConfigurationManager.GetEncodingOptions(); - var ffmpegCommandLineArguments = _encodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, outputPath, "superfast"); + var ffmpegCommandLineArguments = _encodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, "superfast"); return await FileStreamResponseHelpers.GetTranscodedFile( state, isHeadRequest, |
