Merge branch 'jellyfin:master' into BDMV-pgs
This commit is contained in:
@@ -12,6 +12,7 @@ using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AsyncKeyedLock;
|
||||
using Jellyfin.Extensions;
|
||||
using MediaBrowser.Common;
|
||||
using MediaBrowser.Common.Configuration;
|
||||
using MediaBrowser.Common.Extensions;
|
||||
@@ -453,7 +454,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||
encodingParam = " -sub_charenc " + encodingParam;
|
||||
}
|
||||
|
||||
var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath);
|
||||
var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath.EscapeProcessArgument(), outputPath.EscapeProcessArgument());
|
||||
|
||||
await ExtractSubtitlesForFile(
|
||||
inputPath,
|
||||
@@ -631,7 +632,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||
streamIndex,
|
||||
outputCodec,
|
||||
outputFormatOption,
|
||||
outputPath);
|
||||
outputPath.EscapeProcessArgument());
|
||||
}
|
||||
|
||||
await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
|
||||
@@ -689,7 +690,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||
streamIndex,
|
||||
outputCodec,
|
||||
outputFormatOption,
|
||||
outputPath);
|
||||
outputPath.EscapeProcessArgument());
|
||||
}
|
||||
|
||||
if (outputPaths.Count > 0)
|
||||
|
||||
Reference in New Issue
Block a user