Merge remote-tracking branch 'upstream/3.0' into 3.0

lib/get-info.js

@@ -15,10 +15,10 @@ var ffmpeg = require("./ffmpeg");
  * Prefer WebM over MP4, ignore other codecs (e.g. FLV)
  */
 const GOOGLE_PREFERENCE = {
-    "hd1080": [46, 37],
-    "hd720": [45, 22],
-    "large": [44, 59],
-    "medium": [43, 18, 34] // 34 is 360p FLV as a last-ditch
+    "hd1080": [37, 46],
+    "hd720": [22, 45],
+    "large": [59, 44],
+    "medium": [18, 43, 34] // 34 is 360p FLV as a last-ditch
 };
 
 const CONTENT_TYPES = {

lib/server.js

@@ -1,4 +1,4 @@
-const VERSION = "3.7.0";
+const VERSION = "3.7.1";
 var singleton = null;
 var Config = require("./config");
 

package.json

@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
@@ -13,7 +13,7 @@
     "compression": "^1.3.0",
     "cookie-parser": "^1.3.3",
     "csrf": "^2.0.6",
-    "cytubefilters": "git://github.com/calzoneman/cytubefilters#33b7693c",
+    "cytubefilters": "git://github.com/calzoneman/cytubefilters#7663b3a9",
     "express": "^4.11.1",
     "express-minify": "^0.1.3",
     "graceful-fs": "^3.0.5",