Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2013-06-10 22:36:32 -04:00 · 2013-06-10 22:36:32 -04:00 · 7b9a5ba3cb
commit 7b9a5ba3cb
parent 2b4111d4fd f1b14bec97
1 changed files with 2 additions and 1 deletions
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@ -41,7 +41,8 @@ namespace MediaBrowser.Controller.Resolvers
                ".flv",
                ".f4v",
                ".3gp",
-                ".webm"
+                ".webm",
+                ".mts"
        };

        /// <summary>