alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-13 08:02:23 +00:00
Code Issues Actions 2 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
parent 90853a3ab1 972ca5e449
commit a905945d8b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
SharedVersion.cs
View File

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