1 files changed, 33 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index 35d7ada6b..a8f203e22 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -21,10 +21,15 @@ namespace MediaBrowser.Model.Dlna
 
         public List<string> GetContainers()
         {
+            return SplitValue(Container);
+        }
+
+        private static List<string> SplitValue(string value)
+        {
             List<string> list = new List<string>();
-            foreach (string i in (Container ?? string.Empty).Split(','))
+            foreach (string i in (value ?? string.Empty).Split(','))
             {
-                if (!string.IsNullOrEmpty(i)) list.Add(i);
+                if (!string.IsNullOrWhiteSpace(i)) list.Add(i);
             }
             return list;
         }
@@ -33,7 +38,32 @@ namespace MediaBrowser.Model.Dlna
         {
             List<string> containers = GetContainers();
 
-            return containers.Count == 0 || ListHelper.ContainsIgnoreCase(containers, container ?? string.Empty);
+            return ContainsContainer(containers, container);
+        }
+
+        public static bool ContainsContainer(string profileContainers, string inputContainer)
+        {
+            return ContainsContainer(SplitValue(profileContainers), inputContainer);
+        }
+
+        public static bool ContainsContainer(List<string> profileContainers, string inputContainer)
+        {
+            if (profileContainers.Count == 0)
+            {
+                return true;
+            }
+
+            var allInputContainers = SplitValue(inputContainer);
+
+            foreach (var container in allInputContainers)
+            {
+                if (ListHelper.ContainsIgnoreCase(profileContainers, container))
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
     }
 }