diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-09-24 15:15:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 15:15:32 +0100 |
| commit | 89e67b2e7faf76abaa226f6df63f837a614f6f28 (patch) | |
| tree | b112f6eeb41741896a778e9123400cffe14a56e1 /Jellyfin.Api/Controllers/VideosController.cs | |
| parent | 0ec3633f9e3d2d3cf78dbcc0fe7d084ac3ccbf3d (diff) | |
| parent | 226316a4863af5cac17e906cde214dabde5a6692 (diff) | |
Merge branch 'master' into NetworkPR2
Diffstat (limited to 'Jellyfin.Api/Controllers/VideosController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/VideosController.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/VideosController.cs b/Jellyfin.Api/Controllers/VideosController.cs index cce4cfbe3..4de7aac71 100644 --- a/Jellyfin.Api/Controllers/VideosController.cs +++ b/Jellyfin.Api/Controllers/VideosController.cs @@ -326,9 +326,9 @@ namespace Jellyfin.Api.Controllers /// <param name="streamOptions">Optional. The streaming options.</param> /// <response code="200">Video stream returned.</response> /// <returns>A <see cref="FileResult"/> containing the audio file.</returns> - [HttpGet("{itemId}/{stream=stream}.{container?}", Name = "GetVideoStream_2")] + [HttpGet("{itemId}/{stream=stream}.{container?}", Name = "GetVideoStreamWithExt")] [HttpGet("{itemId}/stream")] - [HttpHead("{itemId}/{stream=stream}.{container?}", Name = "HeadVideoStream_2")] + [HttpHead("{itemId}/{stream=stream}.{container?}", Name = "HeadVideoStreamWithExt")] [HttpHead("{itemId}/stream", Name = "HeadVideoStream")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesVideoFile] |