diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-09 14:27:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 14:27:09 -0400 |
| commit | dd463ab06c6eab82a0deeeab107663310d167108 (patch) | |
| tree | 292c8b51247b43284f8de7866d5241cba5687787 /MediaBrowser.Model/Configuration | |
| parent | 8f604c657c379e331622a01c14571a7be2b68129 (diff) | |
| parent | 064ea2799464c7db5e6dbebd6228721840568690 (diff) | |
Merge pull request #2149 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model/Configuration')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index d49816803..9a0b2d35b 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -22,7 +22,6 @@ namespace MediaBrowser.Model.Configuration EncodingThreadCount = -1; VaapiDevice = "/dev/dri/card0"; H264Crf = 23; - H264Preset = "superfast"; } } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index a444afb07..40ac4be8a 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -217,7 +217,7 @@ namespace MediaBrowser.Model.Configuration Migrations = new string[] { }; CodecsUsed = new string[] { }; SqliteCacheSize = 0; - ImageExtractionTimeoutMs = 14000; + ImageExtractionTimeoutMs = 0; EnableLocalizedGuids = true; DisplaySpecialsWithinSeasons = true; |