diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-09-18 17:15:57 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-09-18 17:15:57 -0400 |
| commit | c3d6c19cc32f1ec16aa5aa1e1691a9d101c1251c (patch) | |
| tree | 51cf263be6bcadd54c9c75baa2be4ee16271413c | |
| parent | aff7309a08b01d7eae24d140f55d36898b49d3df (diff) | |
| parent | 4dc5d901b6c320de7e5027a5a58444fae228b727 (diff) | |
Merge pull request #1182 from hmflash/fix-ffprobe-argumentexception
Fix ffprobe keyframe detection on linux
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index d317acc59..fe300e2c4 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -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)) |