Merge pull request #2426 from MediaBrowser/beta

Beta
This commit is contained in:
Luke 2017-01-26 23:01:32 -05:00 committed by GitHub
commit 484f9a15a2

View File

@ -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;
return codec;
//if (string.Equals(codec, "mp2", StringComparison.OrdinalIgnoreCase))
//{
// return null;
//}
//if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
//{
// return null;
//}
//return codec;
}
/// <summary>