Merge branch 'transcoding_progress'

This probably broke stuff

1 files changed, 2 insertions, 1 deletions

diff --git a/bower.json b/bower.json
index 993921bd..4e2756d2 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,8 @@
   ],
   "dependencies": {
     "jquery": "~2.1.3",
-    "video.js": "~4.11.4",
+    "video.js": "~5.20.1",
+    "videojs-resolution-switcher": "~0.4.2",
     "leaflet": "~0.7.3"
   }
 }