diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-29 11:43:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 11:43:03 -0400 |
| commit | d64005df40c535b3495d61b3f3319adae38f2d26 (patch) | |
| tree | 20a893adfb1193ad72241d7b07bb59ce95ffd4b3 /MediaBrowser.Controller | |
| parent | c523e576c46275a9ce752c0e26175b273efe3758 (diff) | |
| parent | 7a88e7fa34597807cb440ff2b8e9f2fd5831b7f0 (diff) | |
Merge pull request #1812 from dkanada/settings
Avoid editing preferences without user interaction
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index eb3d2ab81..46088667a 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -83,9 +83,6 @@ namespace MediaBrowser.Controller.MediaEncoding } } - // Avoid performing a second attempt when the first one - // hasn't tried hardware encoding anyway. - encodingOptions.EnableHardwareEncoding = false; return defaultEncoder; } |