mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #14493] [MERGED] Fix trickplay extraction ffmpeg error-handling #14012
Reference in New Issue
Block a user
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/14493
Author: @jkhsjdhjs
Created: 7/19/2025
Status: ✅ Merged
Merged: 7/23/2025
Merged by: @crobibero
Base:
master← Head:fix-trickplay-ffmpeg-error-handling📝 Commits (2)
2600fe4Fix trickplay extraction ffmpeg error-handling4d7536dRemove excess trickplay extraction error logging📊 Changes
1 file changed (+1 additions, -4 deletions)
View changed files
📝
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs(+1 -4)📄 Description
If ffmpeg runs to completion, i.e. isn't killed due to being unresponsive, its exit code is >0 in case of an error. However, the current logic only throws an exception in case the exit code is -1, which is the virtual exit code assigned in case ffmpeg has been killed prematurely.
This commit simplifies the logic to throw an exception if ffmpeg didn't run to completion (as before) or exited with a non-zero exit code (new).
This change is especially important for #14467, as the fallback will not be triggered if ffmpeg errors are not recognized properly.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.