wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fmp4-hls

Browse Source
This commit is contained in:
nyanmisaka
2020-11-20 12:30:16 +08:00
parent 9e9ecbd677 1191671656
commit 3b50c0dde1
303 changed files with 7220 additions and 6352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/browserDeviceProfile.js
+7 -7
View File
@@ -1,7 +1,7 @@
define(['browser', 'userSettings', 'appSettings'], function (browser, userSettings, appSettings) {
'use strict';
browser = browser.default || browser;
import appSettings from './settings/appSettings';
import * as userSettings from './settings/userSettings';
import browser from './browser';
/* eslint-disable indent */
function canPlayH264(videoTestElement) {
return !!(videoTestElement.canPlayType && videoTestElement.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
@@ -294,7 +294,7 @@ define(['browser', 'userSettings', 'appSettings'], function (browser, userSettin
(browser.tizen && isTizenFhd ? 20000000 : null)));
}
return function (options) {
export default function (options) {
options = options || {};
const isSurroundSoundSupportedBrowser = browser.safari || browser.chrome || browser.edgeChromium || browser.firefox;
@@ -981,5 +981,5 @@ define(['browser', 'userSettings', 'appSettings'], function (browser, userSettin
});
return profile;
};
});
}
/* eslint-enable indent */