js-ffmpeg - npm Package Compare versions

Comparing version 0.0.28 to 0.0.29

demos/video_transcode.js

		@@ -6,2 +6,4 @@ var jsffmpeg = require(__dirname + "/../index.js");
		["", "target=FILE", "target video"],
		["", "width=WIDTH", "target width"],
		["", "height=HEIGHT", "target height"],
		["", "watermark=FILE", "watermark image"],
		@@ -18,4 +20,4 @@ ["", "docker=CONTAINER", "docker"],
		jsffmpeg.ffmpeg_graceful(args.source, {
		width: 640,
		height: 360,
		width: parseInt(args.width) \|\| 640,
		height: parseInt(args.height) \|\| 360,
		watermark: args.watermark,
		@@ -29,5 +31,4 @@ //normalize_audio: true
		}, args.target, null, null, {
		test_ffmpeg: true,
		timeout: args.timeout
		/*docker: {
		/*
		docker: {
		"container" : "jrottenberg/ffmpeg",
		@@ -51,8 +52,11 @@ "proxy": "localhost:1234",
		},
		"test_info" : {
		"capabilities" : {
		"auto_rotate" : true
		},
		"encoders" : ["libdfk_aac", "aac"]
		}*/
		"test_info" : {
		"capabilities" : {
		"auto_rotate" : true
		},
		"encoders" : ["libdfk_aac", "aac"]
		},
		*/
		test_ffmpeg: true,
		timeout: args.timeout
		}).success(function (data) {
		@@ -59,0 +63,0 @@ console.log(data);

Gruntfile.js

		@@ -19,4 +19,3 @@ module.exports = function(grunt) {
		options : {
		es5 : false,
		es3 : true
		esversion: 6
		},
		@@ -23,0 +22,0 @@ source : [ "./Gruntfile.js", "./index.js", "./tests/tests/*.js",

package.json

		{
		"name": "js-ffmpeg",
		"description": "JS FFMpeg",
		"version": "0.0.28",
		"version": "0.0.29",
		"author": "Ziggeo",
		@@ -14,3 +14,3 @@ "repository": "https://github.com/jsonize/js-ffmpeg",
		"grunt": "^1.0.1",
		"grunt-contrib-jshint": "^1.1.0",
		"grunt-contrib-jshint": "^3.0.0",
		"grunt-shell": "^2.1.0",
		@@ -25,3 +25,6 @@ "qunitjs": "^2.4.1"
		"tmp": "0.0.33"
		},
		"scripts": {
		"test": "qunit tests/tests/*.js"
		}
		}
		}

src/ffmpeg-helpers.js

		@@ -77,3 +77,3 @@ Scoped.require([
		if (time_end) {
		args.push("-t");
		args.push("-to");
		args.push(this.formatTimeCode(time_end));
		@@ -80,0 +80,0 @@ }

New alerts