[PR #14493] [MERGED] Fix trickplay extraction ffmpeg error-handling #14012

Closed
opened 2026-02-07 07:22:54 +03:00 by OVERLORD · 0 comments
Owner

📋 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: masterHead: fix-trickplay-ffmpeg-error-handling


📝 Commits (2)

  • 2600fe4 Fix trickplay extraction ffmpeg error-handling
  • 4d7536d Remove 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.

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/14493 **Author:** [@jkhsjdhjs](https://github.com/jkhsjdhjs) **Created:** 7/19/2025 **Status:** ✅ Merged **Merged:** 7/23/2025 **Merged by:** [@crobibero](https://github.com/crobibero) **Base:** `master` ← **Head:** `fix-trickplay-ffmpeg-error-handling` --- ### 📝 Commits (2) - [`2600fe4`](https://github.com/jellyfin/jellyfin/commit/2600fe40cd427b4edfb1b9e3eac13d2a5aa0ca1c) Fix trickplay extraction ffmpeg error-handling - [`4d7536d`](https://github.com/jellyfin/jellyfin/commit/4d7536de76cbbad22095e38aee13d223bece79d2) Remove excess trickplay extraction error logging ### 📊 Changes **1 file changed** (+1 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs` (+1 -4) </details> ### 📄 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. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-07 07:22:54 +03:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#14012