Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-01 04:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1812 from dkanada/settings

Browse Source 
Avoid editing preferences without user interaction
This commit is contained in:
Joshua M. Boniface 2019-09-29 11:43:03 -04:00 committed by GitHub
commit d64005df40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -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; return defaultEncoder;
} }