diff --git a/pkg/ffmpeg/ffprobe.go b/pkg/ffmpeg/ffprobe.go index 67b1351e6..6561da8d5 100644 --- a/pkg/ffmpeg/ffprobe.go +++ b/pkg/ffmpeg/ffprobe.go @@ -197,11 +197,21 @@ func (v *VideoFile) getVideoStream() *FFProbeStream { } func (v *VideoFile) getStreamIndex(fileType string, probeJSON FFProbeJSON) int { + ret := -1 for i, stream := range probeJSON.Streams { - if stream.CodecType == fileType { - return i + // skip cover art/thumbnails + if stream.CodecType == fileType && stream.Disposition.AttachedPic == 0 { + // prefer default stream + if stream.Disposition.Default == 1 { + return i + } + + // backwards compatible behaviour - fallback to first matching stream + if ret == -1 { + ret = i + } } } - return -1 + return ret } diff --git a/ui/v2.5/src/components/Changelog/versions/v0161.md b/ui/v2.5/src/components/Changelog/versions/v0161.md index 1d5b143dc..f562739c0 100644 --- a/ui/v2.5/src/components/Changelog/versions/v0161.md +++ b/ui/v2.5/src/components/Changelog/versions/v0161.md @@ -1,2 +1,3 @@ ### 🐛 Bug fixes +* Fix incorrect scene metadata being set when video has cover art. ([#2752](https://github.com/stashapp/stash/pull/2752)) * Fix incorrect image being displayed when first previewing image. ([#2754](https://github.com/stashapp/stash/pull/2754))