rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

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
commit fb2d568c76
3 changed files with 7 additions and 7 deletions
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)
*/
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 = {

2
lib/server.js
View file

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