Merge pull request #2487 from MediaBrowser/dev

Dev
MediaBrowser · Feb 24, 2017 · ca2cb6b · ca2cb6b
2 parents cf1abfd + 0b5069a
commit ca2cb6b
Show file tree

Hide file tree

Showing 64 changed files with 210 additions and 122 deletions.
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -87,10 +87,7 @@ private bool IsVaapiSupported(EncodingJobInfo state)
                 // [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/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/apiclient.js b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/apiclient.js
diff --git a/...rowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/...rowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
diff --git a/....WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/....WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/dom.js b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/dom.js
diff --git a/...Dashboard/dashboard-ui/bower_components/emby-webcomponents/emby-scroller/emby-scroller.js b/...Dashboard/dashboard-ui/bower_components/emby-webcomponents/emby-scroller/emby-scroller.js
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/flexstyles.css b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/flexstyles.css