merging changes

This commit is contained in:
rlx 2011-10-08 17:20:34 +00:00
commit 331d23012c

View file

@ -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) {
} }
}; };