Merge branch 'master' of github.com:jellyfin/jellyfin into ffmpeg

MediaBrowser.Common/Providers/SubtitleConfigurationFactory.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Providers;
+
+namespace MediaBrowser.Common.Providers
+{
+    public class SubtitleConfigurationFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            yield return new ConfigurationStore()
+            {
+                Key = "subtitles",
+                ConfigurationType = typeof(SubtitleOptions)
+            };
+        }
+    }
+}