1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-27 02:43:45 +02:00

Merge branch 'master' of github.com:zencoder/video-js

This commit is contained in:
Steve Heffernan 2011-10-03 10:30:48 -07:00
commit 3daa81f87e

View File

@ -98,7 +98,7 @@ var VideoJS = _V_ = function(id, options){
};
VideoJS.options = {
techOrder: ["h5swf","html5","flowplayer"],
techOrder: ["html5","h5swf","flowplayer"],
controlSets: ["bigPlayButton", "bar", "subtitlesBox"/*, "replay"*/],
controlSetOptions: {
bigPlayButton: {},
@ -3281,4 +3281,4 @@ _V_.loadPlayerTimeout(1); // Let vjs javascript finish executing
window.VideoJS = window._V_ = VideoJS;
// End self-executing function
})(window);
})(window);