lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2487 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-02-24 12:19:36 -05:00 committed by GitHub
commit a905945d8b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -86,13 +86,10 @@ namespace MediaBrowser.Controller.MediaEncoding
// vaapi will throw an error with this input // vaapi will throw an error with this input
// [vaapi @ 0x7faed8000960] No VAAPI support for codec mpeg4 profile -99. // [vaapi @ 0x7faed8000960] No VAAPI support for codec mpeg4 profile -99.
if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoStream.Codec, "mpeg4", StringComparison.OrdinalIgnoreCase))
{
if (videoStream.Level == -99 || videoStream.Level == 15)
{ {
return false; return false;
} }
} }
}
return true; return true;
} }

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.1.116")] [assembly: AssemblyVersion("3.2.2.1")]