From 51abf6f503dae58428f3558e77805f2937335d8f Mon Sep 17 00:00:00 2001 From: crobibero Date: Tue, 15 Sep 2026 11:15:47 -0400 Subject: Backport pull request #17883 from jellyfin/release-12.z Fix trickplay using the wrong video stream Original-merge: 31f05331911748eeda047be92f19dfd801b9fff6 Merged-by: crobibero Backported-by: Cody Robibero --- MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'MediaBrowser.MediaEncoding') diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index f64fd73763..fa43d756a4 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -922,6 +922,15 @@ namespace MediaBrowser.MediaEncoding.Encoder inputArg = "-hwaccel_flags +low_priority " + inputArg; } + // Force the video stream, otherwise ffmpeg may pick a cover image. + var streamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, imageStream); + if (streamIndex < 0) + { + throw new InvalidOperationException($"Unable to locate requested stream {imageStream.Title}"); + } + + inputArg += " -map 0:" + streamIndex; + var filterParam = encodingHelper.GetVideoProcessingFilterParam(jobState, options, vidEncoder).Trim(); if (string.IsNullOrWhiteSpace(filterParam)) { -- cgit v1.2.3