aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-20 02:50:41 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-06-20 02:50:41 -0400
commit2edaff2ad34e019774d6cdad98a41d65aeba8c88 (patch)
tree0eb87dfa853a12f60cd30c639598437c22d1afc5 /MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
parent36d53b7ec0be9682ffbf31f4fca705d63d7c0c8d (diff)
parent365f6f957ddea650acf99eb09b0356939cf15a7c (diff)
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs')
-rw-r--r--MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
index 0ae021407..d92dc1b96 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
+++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
@@ -21,13 +21,10 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
_fileSystem = fileSystem;
}
- public Tuple<List<string>,List<string>> Validate(FFMpegInfo info)
+ public Tuple<List<string>,List<string>> Validate(string encoderPath)
{
- _logger.Info("FFMpeg: {0}", info.EncoderPath);
- _logger.Info("FFProbe: {0}", info.ProbePath);
-
- var decoders = GetDecoders(info.EncoderPath);
- var encoders = GetEncoders(info.EncoderPath);
+ var decoders = GetDecoders(encoderPath);
+ var encoders = GetEncoders(encoderPath);
return new Tuple<List<string>, List<string>>(decoders, encoders);
}