Merge remote-tracking branch 'upstream/master' into fix-series-merging

2026-08-22 17:18:01 +02:00
parent 335d97d868 0d02638e82
commit e1af8dce05
52 changed files with 4285 additions and 515 deletions
@@ -1318,7 +1318,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                    arg.Append(canvasArgs);
                }

-                arg.Append(" -i file:\"").Append(subtitlePath).Append('\"');
+                arg.Append(" -i file:\"").Append(subtitlePath.EscapeProcessArgument()).Append('\"');
            }

            if (state.AudioStream is not null && state.AudioStream.IsExternal)
@@ -1330,7 +1330,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                    arg.Append(' ').Append(seekAudioParam);
                }

-                arg.Append(" -i \"").Append(state.AudioStream.Path).Append('"');
+                arg.Append(" -i \"").Append(state.AudioStream.Path.EscapeProcessArgument()).Append('"');
            }

            // Disable auto inserted SW scaler for HW decoders in case of changed resolution.