Merge pull request #1164 from MediaBrowser/dev

3.0.5724.1

1 files changed, 6 insertions, 15 deletions

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index d1abda17e..e0cc1b705 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -735,7 +735,12 @@ namespace MediaBrowser.Model.Dlna
                         continue;
                     }
 
-                    if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
+                    if (profile.Method != SubtitleDeliveryMethod.Embed)
+                    {
+                        continue;
+                    }
+
+                    if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format) && StringHelper.EqualsIgnoreCase(profile.Format, subtitleStream.Codec))
                     {
                         return profile;
                     }
@@ -772,20 +777,6 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            // Look for supported embedded subs that we can just mux into the output
-            foreach (SubtitleProfile profile in subtitleProfiles)
-            {
-                if (!profile.SupportsLanguage(subtitleStream.Language))
-                {
-                    continue;
-                }
-
-                if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
-                {
-                    return profile;
-                }
-            }
-
             return new SubtitleProfile
             {
                 Method = SubtitleDeliveryMethod.Encode,