Merge pull request #2426 from MediaBrowser/beta

Beta
8 years ago · 484f9a15a2
parent 85fd32cc81 c14d8b0bbc
commit 484f9a15a2
1 changed files with 11 additions and 9 deletions
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@ -2737,16 +2737,18 @@ namespace MediaBrowser.Api.Playback

        private string GetDecoderFromCodec(string codec)
        {
-            if (string.Equals(codec, "mp2", StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-            if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
+            return null;
+
+            //if (string.Equals(codec, "mp2", StringComparison.OrdinalIgnoreCase))
+            //{
+            //    return null;
+            //}
+            //if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
+            //{
+            //    return null;
+            //}

-            return codec;
+            //return codec;
        }

        /// <summary>