mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-23 23:20:51 +01:00
[PR #10710] [MERGED] Use eof_action=pass when overlaying subtitles #12408
Labels
No labels
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
EFjellyfin.db
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: starred/jellyfin#12408
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/10710
Author: @jkhsjdhjs
Created: 12/12/2023
Status: ✅ Merged
Merged: 12/13/2023
Merged by: @cvium
Base:
master← Head:fix/subtitle_overlay_eof_action📝 Commits (1)
547d97dUseeof_action=passwhen overlaying subtitles📊 Changes
1 file changed (+13 additions, -13 deletions)
View changed files
📝
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs(+13 -13)📄 Description
The previous behavior using
eof_action=endallandshortest=1would end the video stream if one of the input stream (video, subtitle) ends. In some cases the duration of the overlayed subtitles is shorter than the video stream, causing the output to end when the subtitles end and dropping the remaining video stream.This commit changes this behavior so
eof_action=passis used instead, which continues passing the video stream through even if the subtitles end earlier [1].shortest=1is also removed, as this option implieseof_action=endall.If the subtitle stream has a higher duration than the video stream, the output will also end with the video stream without
shortest=1, as the video stream is the primary input to theoverlayfilter.Fix #10698
[1] https://ffmpeg.org/ffmpeg-filters.html#Options-for-filters-with-several-inputs-_0028framesync_0029
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.