mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-11-21 15:22:34 +00:00
Merge branch 'jellyfin:master' into BDMV-pgs
This commit is contained in:
commit
4207e89a7d
112 changed files with 8614 additions and 861 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.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue