Merge branch 'api-migration' into api-syncplay

# Conflicts:
#	MediaBrowser.Api/SyncPlay/SyncPlayService.cs

1 files changed, 5 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index c0043c0ef..c2932cc4c 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -24,6 +24,11 @@ namespace MediaBrowser.Controller.Extensions
         public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration";
 
         /// <summary>
+        /// The key for the FFmpeg path option.
+        /// </summary>
+        public const string FfmpegPathKey = "ffmpeg";
+
+        /// <summary>
         /// The key for a setting that indicates whether playlists should allow duplicate entries.
         /// </summary>
         public const string PlaylistsAllowDuplicatesKey = "playlists:allowDuplicates";