specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
bush 2015-03-06 22:00:40 +00:00
parent 6138d3b7ff e6bdbb99b1
commit fb2d568c76
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/get-info.js
View file

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

2
lib/server.js
View file

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

4
package.json
View file

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