aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding
diff options
context:
space:
mode:
authorNyanmisaka <nst799610810@gmail.com>2025-06-27 07:48:43 +0800
committerGitHub <noreply@github.com>2025-06-26 17:48:43 -0600
commitebdc756547ece276b9051226903d2d6794fe6e2b (patch)
tree2d87ed4ff28a4abc8d7b8ed9d9c65afda0dfeb26 /MediaBrowser.Controller/MediaEncoding
parent10d0cec7b9b4393bb33272c3fcefb89c6ae03228 (diff)
Fix -fps_mode option being applied on input (#14379)
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c9122ab46..cd805f3dc 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -7151,7 +7151,8 @@ namespace MediaBrowser.Controller.MediaEncoding
inputModifier += " -async " + state.InputAudioSync;
}
- if (!string.IsNullOrEmpty(state.InputVideoSync))
+ // The -fps_mode option cannot be applied to input
+ if (!string.IsNullOrEmpty(state.InputVideoSync) && _mediaEncoder.EncoderVersion < new Version(5, 1))
{
inputModifier += GetVideoSyncOption(state.InputVideoSync, _mediaEncoder.EncoderVersion);
}