aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-29 23:11:25 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-29 23:11:25 -0400
commit3ebfb594560259be5571b0103363795af56d3c59 (patch)
treef3ca9ac4fb8b9b57febc9a0ccde811cef9994949
parent367e16dcdf0250c0bf8b819aa0f95b9154036e49 (diff)
add error handling
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 5b9a2a682..b5be4eb87 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -322,7 +322,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
ffmpegPath = files.FirstOrDefault(i => string.Equals(Path.GetFileNameWithoutExtension(i), "ffmpeg", StringComparison.OrdinalIgnoreCase));
- ffprobePath = GetProbePathFromEncoderPath(ffmpegPath);
+
+ if (!string.IsNullOrWhiteSpace(ffmpegPath))
+ {
+ ffprobePath = GetProbePathFromEncoderPath(ffmpegPath);
+ }
}
return new Tuple<string, string>(ffmpegPath, ffprobePath);