Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed most links to index.js, removed some trailing whitespace

  • Loading branch information...
commit 0774bc476086dc209067e674afcc7276700ade9d 1 parent 512d3c9
John Lancaster jlank authored
4 examples/express-stream.js
View
@@ -1,5 +1,5 @@
var express = require('express'),
- ffmpeg = require('../lib/');
+ ffmpeg = require('../index');
var app = express.createServer();
@@ -22,4 +22,4 @@ app.get('/video/:filename', function(req, res) {
});
});
-app.listen(4000);
+app.listen(4000);
2  examples/full.js
View
@@ -1,4 +1,4 @@
-var ffmpeg = require('../lib/');
+var ffmpeg = require('../index');
// make sure you set the correct path to your video file
var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
4 examples/input-stream.js
View
@@ -1,5 +1,5 @@
var fs = require('fs'),
- ffmpeg = require('./lib/');
+ ffmpeg = require('../index');
// open input stream
var infs = fs.createReadStream(__dirname + '/test/assets/testvideo-43.avi');
@@ -14,4 +14,4 @@ var proc = new ffmpeg({ source: infs, nolog: true })
.usingPreset('flashvideo')
.saveToFile('/path/to/your_target.flv', function(stdout, stderr, err) {
console.log('done processing input stream');
- });
+ });
4 examples/metadata.js
View
@@ -1,7 +1,7 @@
-var Metalib = require('../lib/').Metadata;
+var Metalib = require('../index').Metadata;
// make sure you set the correct path to your video file
var metaObject = new Metalib('/path/to/your_movie.avi');
metaObject.get(function(metadata, err) {
console.log(require('util').inspect(metadata, false, null));
-});
+});
4 examples/preset.js
View
@@ -1,4 +1,4 @@
-var ffmpeg = require('../lib');
+var ffmpeg = require('../index');
// make sure you set the correct path to your video file
var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
@@ -9,4 +9,4 @@ var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
// save to file
.saveToFile('/path/to/your_target.m4v', function(retcode, error){
console.log('file has been converted succesfully');
- });
+ });
4 examples/progress.js
View
@@ -1,5 +1,5 @@
var fs = require('fs'),
- ffmpeg = require('./lib/');
+ ffmpeg = require('../index');
// open input stream
var infs = fs.createReadStream(__dirname + '/test/assets/testvideo-43.avi');
@@ -16,4 +16,4 @@ var proc = new ffmpeg({ source: infs, nolog: true })
})
.saveToFile('/path/to/your_target.flv', function(stdout, stderr, err) {
console.log('done processing input stream');
- });
+ });
4 examples/stream.js
View
@@ -1,4 +1,4 @@
-var ffmpeg = require('../lib/'),
+var ffmpeg = require('../index'),
fs = require('fs');
// create the target stream (can be any WritableStream)
@@ -11,4 +11,4 @@ var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
// save to stream
.writeToStream(stream, function(retcode, error){
console.log('file has been converted succesfully');
- });
+ });
4 examples/thumbnails.js
View
@@ -1,4 +1,4 @@
-var ffmpeg = require('../lib/');
+var ffmpeg = require('../index');
var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
// set the size of your thumbnails
@@ -6,4 +6,4 @@ var proc = new ffmpeg({ source: '/path/to/your_movie.avi', nolog: true })
// take 2 screenshots at predefined timemarks
.takeScreenshots({ count: 2, timemarks: [ '00:00:02.000', '6' ] }, '/path/to/thumbnail/folder', function(err) {
console.log('screenshots were saved');
- });
+ });
30 test/args.test.js
View
@@ -1,4 +1,4 @@
-var Ffmpeg = require('../lib'),
+var Ffmpeg = require('../index'),
path = require('path'),
exec = require('child_process').exec;
@@ -7,7 +7,7 @@ describe('Command', function() {
// check for ffmpeg installation
this.testfile = __dirname + '/assets/testvideo-43.avi';
this.testfilewide = __dirname + '/assets/testvideo-169.avi';
-
+
var self = this;
exec('which ffmpeg', function(err, stdout, stderr) {
if (stdout !== '') {
@@ -223,7 +223,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-r').should.above(-1);
args.indexOf(27.77).should.above(-1);
- done();
+ done();
});
});
});
@@ -235,7 +235,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-aspect').should.above(-1);
args.indexOf('16:9').should.above(-1);
- done();
+ done();
});
});
});
@@ -247,7 +247,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-vcodec').should.above(-1);
args.indexOf('divx').should.above(-1);
- done();
+ done();
});
});
});
@@ -259,7 +259,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-ab').should.above(-1);
args.indexOf('256k').should.above(-1);
- done();
+ done();
});
});
});
@@ -271,7 +271,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-acodec').should.above(-1);
args.indexOf('mp3').should.above(-1);
- done();
+ done();
});
});
});
@@ -283,7 +283,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-ac').should.above(-1);
args.indexOf(1).should.above(-1);
- done();
+ done();
});
});
});
@@ -295,7 +295,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-ar').should.above(-1);
args.indexOf(22500).should.above(-1);
- done();
+ done();
});
});
});
@@ -307,7 +307,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-ss').should.above(-1);
args.indexOf('00:00:10').should.above(-1);
- done();
+ done();
});
});
});
@@ -319,7 +319,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-t').should.above(-1);
args.indexOf(10).should.above(-1);
- done();
+ done();
});
});
});
@@ -331,7 +331,7 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-ab').should.above(-1);
args.indexOf('256k').should.above(-1);
- done();
+ done();
});
});
it('should apply supplied extra options', function(done) {
@@ -344,7 +344,7 @@ describe('Command', function() {
args.indexOf('+chroma').should.above(-1);
args.indexOf('-partitions').should.above(-1);
args.indexOf('+parti4x4+partp8x8+partb8x8').should.above(-1);
- done();
+ done();
});
});
});
@@ -356,8 +356,8 @@ describe('Command', function() {
.getArgs(function(args) {
args.indexOf('-f').should.above(-1);
args.indexOf('mp4').should.above(-1);
- done();
+ done();
});
});
});
-});
+});
0  test/assets/testConvertFromStreamToStream.flv
View
No changes.
0  test/assets/testConvertToStream.flv
View
No changes.
6 test/debug.test.js
View
@@ -1,4 +1,4 @@
-var Ffmpeg = require('../lib'),
+var Ffmpeg = require('../index'),
path = require('path'),
exec = require('child_process').exec;
@@ -7,7 +7,7 @@ describe('Debug', function() {
// check for ffmpeg installation
this.testfile = __dirname + '/assets/testvideo-43.avi';
this.testfilewide = __dirname + '/assets/testvideo-169.avi';
-
+
var self = this;
exec('which ffmpeg', function(err, stdout, stderr) {
if (stdout !== '') {
@@ -48,4 +48,4 @@ describe('Debug', function() {
});
});
});
-});
+});
6 test/processor.test.js
View
@@ -1,4 +1,4 @@
-var Ffmpeg = require('../lib'),
+var Ffmpeg = require('../index'),
path = require('path'),
fs = require('fs'),
assert = require('assert'),
@@ -9,7 +9,7 @@ describe('Processor', function() {
// check for ffmpeg installation
this.testfile = __dirname + '/assets/testvideo-43.avi';
this.testfilewide = __dirname + '/assets/testvideo-169.avi';
-
+
var self = this;
exec('which ffmpeg', function(err, stdout, stderr) {
if (stdout !== '') {
@@ -199,4 +199,4 @@ describe('Processor', function() {
});
});
});
-});
+});
Please sign in to comment.
Something went wrong with that request. Please try again.