aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-20 02:47:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-20 02:47:12 -0400
commit39ed3696ad783765b083b4a99fa4d7d91f0fa32c (patch)
treebf98a8f677d4e30c5e84088ecf34e424a4aa5112
parentfb07b4640c60d5135097d25d71cad4d2e4b6131f (diff)
update ffmpeg path config
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index fc627c232..39a233856 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -127,6 +127,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
var appPath = GetEncodingOptions().EncoderAppPath;
+ if (string.IsNullOrWhiteSpace(appPath))
+ {
+ appPath = Path.Combine(ConfigurationManager.ApplicationPaths.ProgramDataPath, "ffmpeg");
+ }
+
if (!string.IsNullOrWhiteSpace(appPath))
{
if (Directory.Exists(appPath))