Merge branch '3.0' into videojs-hls

2016-08-09 22:41:55 -07:00 · 2016-08-09 22:41:55 -07:00 · e99bfcd47b
commit e99bfcd47b
parent 7b95777d99 96a5d657a5
6 changed files with 34 additions and 2 deletions
--- a/player/update.coffee
+++ b/player/update.coffee
@ -16,6 +16,7 @@ TYPE_MAP =
    im: ImgurPlayer
    vm: VideoJSPlayer
    hl: HLSPlayer
+    sb: VideoJSPlayer

 window.loadMediaPlayer = (data) ->
    try