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

Fix ffprobe keyframe detection on linux
9 years ago · c3d6c19cc3
parent aff7309a08 4dc5d901b6
commit c3d6c19cc3
1 changed files with 1 additions and 1 deletions
--- 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))