merge branch master into config

2020-08-03 04:46:07 +09:00
parent 0a0e7112f0 f25728eca4
commit 6c375a52bc
35 changed files with 1467 additions and 1411 deletions
@@ -1,6 +1,8 @@
 define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'globalize'], function (appSettings, browser, events, htmlMediaHelper, webSettings, globalize) {
    'use strict';

+    browser = browser.default || browser;
+
    function getBaseProfileOptions(item) {
        var disableHlsVideoAudioCodecs = [];