diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-07-23 02:10:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-23 02:10:25 -0400 |
| commit | 0d1b5ad733e6f1bbf6d730e723969495dda99016 (patch) | |
| tree | 9d08bbb7b2c00e168137e96624c92868795647e5 /Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs | |
| parent | 7ffaf5e0776c49d0d9e39282e86037fb12d712df (diff) | |
| parent | 8ee79b47bc37d152d8db1380e3c8f03c091b6671 (diff) | |
Merge pull request #2766 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs')
| -rw-r--r-- | Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs index 3c8ad55fe4..e266ea21b8 100644 --- a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs +++ b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs @@ -109,7 +109,7 @@ namespace Emby.Server.Implementations.FFMpeg } if (!string.IsNullOrWhiteSpace(customffProbePath)) { - info.EncoderPath = customffProbePath; + info.ProbePath = customffProbePath; } return info; |