Merge pull request #1182 from hmflash/fix-ffprobe-argumentexception

Fix ffprobe keyframe detection on linux
This commit is contained in:
Luke 2015-09-18 17:15:57 -04:00
commit c3d6c19cc3

View File

@ -386,7 +386,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
var text = await reader.ReadToEndAsync().ConfigureAwait(false);
var lines = StringHelper.RegexSplit(text, "\r\n");
var lines = StringHelper.RegexSplit(text, "[\r\n]+");
foreach (var line in lines)
{
if (string.IsNullOrWhiteSpace(line))