From 950853ba716e3d33d925c69cefaf73137eea03b1 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Thu, 5 Mar 2015 14:31:58 -0600 Subject: [PATCH 1/2] cytubefilters: bump git hash --- lib/server.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/server.js b/lib/server.js index 88032089..11010575 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1,4 +1,4 @@ -const VERSION = "3.7.0"; +const VERSION = "3.7.1"; var singleton = null; var Config = require("./config"); diff --git a/package.json b/package.json index db92ad74..6ab09307 100644 --- a/package.json +++ b/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", From e6bdbb99b1635ca3fcc8c5a24bb686123eecfdd0 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Fri, 6 Mar 2015 00:23:06 -0600 Subject: [PATCH 2/2] Prefer MP4 over WebM because IE can't play webm apparently --- lib/get-info.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/get-info.js b/lib/get-info.js index 9a53f359..b8454326 100644 --- a/lib/get-info.js +++ b/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 = {