Merge branch 'master' into httpclient

1 files changed, 0 insertions, 29 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs b/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
deleted file mode 100644
index 92544f4f6..000000000
--- a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Providers;
-
-namespace MediaBrowser.MediaEncoding.Subtitles
-{
-    public static class ConfigurationExtension
-    {
-        public static SubtitleOptions GetSubtitleConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<SubtitleOptions>("subtitles");
-        }
-    }
-
-    public class SubtitleConfigurationFactory : IConfigurationFactory
-    {
-        public IEnumerable<ConfigurationStore> GetConfigurations()
-        {
-            return new List<ConfigurationStore>
-            {
-                new ConfigurationStore
-                {
-                    Key = "subtitles",
-                    ConfigurationType = typeof (SubtitleOptions)
-                }
-            };
-        }
-    }
-}