diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-02 02:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 02:20:16 -0400 |
| commit | 696cdf27377013cc9237f0ad0ac0614f2ff1cd59 (patch) | |
| tree | 39f835c844b44ce43ad5a967ce4854c5263d83ed /MediaBrowser.Server.Implementations/MediaEncoder | |
| parent | 8d486444c9b72704f35153f07affd41c67df19a8 (diff) | |
| parent | cf4f5039bffa504b65569e2be5b2711e803e105b (diff) | |
Merge pull request #2207 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs index 06c109dfc..21e847c68 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs @@ -61,7 +61,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } var libraryOptions = _libraryManager.GetLibraryOptions(video); - if (libraryOptions != null && libraryOptions.SchemaVersion >= 2) + if (libraryOptions != null) { if (!libraryOptions.EnableChapterImageExtraction) { @@ -70,29 +70,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } else { - var options = _chapterManager.GetConfiguration(); - - if (video is Movie) - { - if (!options.EnableMovieChapterImageExtraction) - { - return false; - } - } - else if (video is Episode) - { - if (!options.EnableEpisodeChapterImageExtraction) - { - return false; - } - } - else - { - if (!options.EnableOtherVideoChapterImageExtraction) - { - return false; - } - } + return false; } // Can't extract images if there are no video streams |
