3.0.5482.1

This commit is contained in:
Luke Pulverenti
2015-01-04 19:49:22 -05:00
parent 5a5ec56328
commit c30036d9cf
5 changed files with 53 additions and 52 deletions

View File

@@ -556,33 +556,28 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
var codec = request.VideoCodec;
if (!string.IsNullOrEmpty(codec))
if (string.Equals(codec, "h264", StringComparison.OrdinalIgnoreCase))
{
if (string.Equals(codec, "h264", StringComparison.OrdinalIgnoreCase))
{
return "libx264";
}
if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase))
{
return "libx265";
}
if (string.Equals(codec, "vpx", StringComparison.OrdinalIgnoreCase))
{
return "libvpx";
}
if (string.Equals(codec, "wmv", StringComparison.OrdinalIgnoreCase))
{
return "wmv2";
}
if (string.Equals(codec, "theora", StringComparison.OrdinalIgnoreCase))
{
return "libtheora";
}
return codec.ToLower();
return "libx264";
}
if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase))
{
return "libx265";
}
if (string.Equals(codec, "vpx", StringComparison.OrdinalIgnoreCase))
{
return "libvpx";
}
if (string.Equals(codec, "wmv", StringComparison.OrdinalIgnoreCase))
{
return "wmv2";
}
if (string.Equals(codec, "theora", StringComparison.OrdinalIgnoreCase))
{
return "libtheora";
}
return "copy";
return (codec ?? string.Empty).ToLower();
}
internal static bool CanStreamCopyVideo(EncodingJobOptions request, MediaStream videoStream)