diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-24 12:19:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 12:19:36 -0500 |
| commit | a905945d8b228bec9c4e15a2e964adb334703be2 (patch) | |
| tree | b50648767336a114188eee55726611a531915b83 | |
| parent | 90853a3ab1e080a02520f6cb135a14e8b2122da3 (diff) | |
| parent | 972ca5e4491e11954e70963554be397f72c2f453 (diff) | |
Merge pull request #2487 from MediaBrowser/dev
Dev
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index c6cbc8986..8407948cf 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -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; diff --git a/SharedVersion.cs b/SharedVersion.cs index e756bc842..5e662ebe6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.1.116")] +[assembly: AssemblyVersion("3.2.2.1")] |