aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-01-26 23:01:32 -0500
committerGitHub <noreply@github.com>2017-01-26 23:01:32 -0500
commit484f9a15a299c85e2a51d73f74429a4517592513 (patch)
tree78b1cd2dfecdd4597ed3107088ae8a4d234f420b
parent85fd32cc81cdf2d4d5752a0f8b85d2501c2028d7 (diff)
parentc14d8b0bbc85f72191d71a12db25e731e09011b5 (diff)
Merge pull request #2426 from MediaBrowser/beta
Beta
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs20
1 files changed, 11 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 33f687ce7..120c00a14 100644
--- 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>