Merge branch 'transcoding_progress'

This probably broke stuff

mediagoblin/static/extlib/video-js

@@ -1 +1 @@
-../../../extlib/video.js/dist/video-js
+../../../extlib/video.js/dist/

mediagoblin/static/extlib/videojs-resolution-switcher

@@ -0,0 +1 @@
+../../../extlib/videojs-resolution-switcher/lib/

mediagoblin/static/js/change-video-resolution.js

@@ -0,0 +1,27 @@
+var glplayer;
+
+$(document).ready(function()
+{
+  // fire up the plugin
+  glplayer = videojs('video_1', {
+    controls: true,
+    muted: true,
+    height: 400,
+    width: 700,
+    plugins: {
+      videoJsResolutionSwitcher: {
+        ui: true,
+        default: 'low', // Default resolution [{Number}, 'low', 'high'],
+        dynamicLabel: true // Display dynamic labels or gear symbol
+      }
+    }
+  }, function(){
+    var player = this;
+    window.player = player
+    player.on('resolutionchange', function(){
+      console.info('Source changed to %s', player.src());
+      console.log(player.currentTime());
+    })
+  })
+
+});