diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-30 02:50:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 02:50:55 -0400 |
| commit | f1f566c130aa652776f102dee464571bf035bf1d (patch) | |
| tree | 5d8226b8f7ca5355afd2b6c554a086224f376271 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 3946c60bb0e62ce208e07c7749b8d1b994978b0a (diff) | |
| parent | 6a7fabc3bd4ab8496a90bd04e9decf48bf16edc2 (diff) | |
Merge pull request #2200 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index d3131eb5a..44103e720 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -235,6 +235,8 @@ namespace MediaBrowser.MediaEncoding.Encoder throw new ResourceNotFoundException("ffprobe not found"); } + path = newPaths.Item1; + if (!ValidateVersion(path)) { throw new ResourceNotFoundException("ffmpeg version 3.0 or greater is required."); |