update subtitle escaping

This commit is contained in:
Luke Pulverenti
2015-08-16 11:53:30 -04:00
parent f6dcef0cfd
commit 1f1f7642c3
8 changed files with 33 additions and 18 deletions

View File

@@ -865,13 +865,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
// TODO: Perhaps also use original_size=1920x800 ??
return string.Format("subtitles=filename='{0}'{1},setpts=PTS -{2}/TB",
subtitlePath.Replace('\\', '/').Replace(":/", "\\:/"),
MediaEncoder.EscapeSubtitleFilterPath(subtitlePath),
charsetParam,
seconds.ToString(UsCulture));
}
return string.Format("subtitles='{0}:si={1}',setpts=PTS -{2}/TB",
state.MediaPath.Replace('\\', '/').Replace(":/", "\\:/"),
MediaEncoder.EscapeSubtitleFilterPath(state.MediaPath),
state.InternalSubtitleStreamOffset.ToString(UsCulture),
seconds.ToString(UsCulture));
}

View File

@@ -765,6 +765,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
public string EscapeSubtitleFilterPath(string path)
{
return path.Replace('\\', '/').Replace(":/", "\\:/").Replace("'", "'\\\\\\'");
}
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>