Merge branch 'master' into sort-nfo-data

1 files changed, 8 insertions, 8 deletions

diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index 7ca508426..e4806109a 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -40,14 +40,14 @@ namespace MediaBrowser.Controller.Extensions
         public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration";
 
         /// <summary>
-        /// The key for the FFmpeg path option.
+        /// The key for the FFmpeg image extraction performance tradeoff option.
         /// </summary>
-        public const string FfmpegPathKey = "ffmpeg";
+        public const string FfmpegImgExtractPerfTradeoffKey = "FFmpeg:imgExtractPerfTradeoff";
 
         /// <summary>
-        /// The key for a setting that indicates whether playlists should allow duplicate entries.
+        /// The key for the FFmpeg path option.
         /// </summary>
-        public const string PlaylistsAllowDuplicatesKey = "playlists:allowDuplicates";
+        public const string FfmpegPathKey = "ffmpeg";
 
         /// <summary>
         /// The key for a setting that indicates whether kestrel should bind to a unix socket.
@@ -108,12 +108,12 @@ namespace MediaBrowser.Controller.Extensions
             => configuration.GetValue<bool>(FfmpegSkipValidationKey);
 
         /// <summary>
-        /// Gets a value indicating whether playlists should allow duplicate entries from the <see cref="IConfiguration"/>.
+        /// Gets a value indicating whether the server should trade off for performance during FFmpeg image extraction.
         /// </summary>
         /// <param name="configuration">The configuration to read the setting from.</param>
-        /// <returns>True if playlists should allow duplicates, otherwise false.</returns>
-        public static bool DoPlaylistsAllowDuplicates(this IConfiguration configuration)
-            => configuration.GetValue<bool>(PlaylistsAllowDuplicatesKey);
+        /// <returns><c>true</c> if the server should trade off for performance during FFmpeg image extraction, otherwise <c>false</c>.</returns>
+        public static bool GetFFmpegImgExtractPerfTradeoff(this IConfiguration configuration)
+            => configuration.GetValue<bool>(FfmpegImgExtractPerfTradeoffKey);
 
         /// <summary>
         /// Gets a value indicating whether kestrel should bind to a unix socket from the <see cref="IConfiguration" />.