aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorSeth Hinze <ultrix@gmail.com>2015-09-14 19:28:29 -0700
committerSeth Hinze <ultrix@gmail.com>2015-09-14 19:28:29 -0700
commit4dc5d901b6c320de7e5027a5a58444fae228b727 (patch)
tree9f055bd7a2b8d3f67ed2f17bee9c6a175a0d22c3 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parentb3bdb3b21dea4a88a2666e9ea80edd2c17e6ef6d (diff)
Split ffprobe output on CRLF or LF.
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 503399f8d..5d5e76074 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -353,7 +353,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))