merging changes
This commit is contained in:
commit
331d23012c
1 changed files with 2 additions and 2 deletions
|
@ -294,7 +294,7 @@ Ox.load.UI = function(options, callback) {
|
||||||
'ogg': 'video/ogg; codecs="theora, vorbis"',
|
'ogg': 'video/ogg; codecs="theora, vorbis"',
|
||||||
'webm': 'video/webm; codecs="vp8, vorbis"'
|
'webm': 'video/webm; codecs="vp8, vorbis"'
|
||||||
},
|
},
|
||||||
userAgent = navigator.userAgent.toLowerCase();
|
userAgent = navigator.userAgent.toLowerCase(),
|
||||||
video = document.createElement('video');
|
video = document.createElement('video');
|
||||||
Ox.forEach(formats, function(f) {
|
Ox.forEach(formats, function(f) {
|
||||||
var alias = aliases[f] || f;
|
var alias = aliases[f] || f;
|
||||||
|
@ -398,4 +398,4 @@ Ox.load.UI = function(options, callback) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue