From 1d50e71325c29fe6db82521cb57b298443cb5229 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <wangstabill@snet.net>
Date: Tue, 20 Nov 2012 23:12:34 -0500
Subject: [PATCH 1/2] Use test instead of exec in conditionals for testing
 regex matches.
 https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/RegExp/test

---
 lib/processor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/processor.js b/lib/processor.js
index e95ca041..97c97d74 100644
--- a/lib/processor.js
+++ b/lib/processor.js
@@ -459,9 +459,9 @@ exports = module.exports = function Processor(command) {
       if (this.options.video.fpsInput) {
         args.push('-r', this.options.video.fpsInput);
       }
-      if (/^[a-z]+:\/\//.exec(this.options.inputfile)) {
+      if (/^[a-z]+:\/\//.test(this.options.inputfile)) {
         args.push('-i', this.options.inputfile.replace(' ', '%20'));
-      } else if (/%\d*d/.exec(this.options.inputfile)) { // multi-file format - http://ffmpeg.org/ffmpeg.html#image2-1
+      } else if (/%\d*d/.test(this.options.inputfile)) { // multi-file format - http://ffmpeg.org/ffmpeg.html#image2-1
         args.push('-i', this.options.inputfile.replace(' ', '\ '));
       } else {
         var fstats = fs.statSync(this.options.inputfile);

From c8423937b46ac75779e4f8061459915c91b4f1bd Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <wangstabill@snet.net>
Date: Wed, 21 Nov 2012 12:05:59 -0500
Subject: [PATCH 2/2] Fixed this warning in newer versions of express.js:
 Warning: express.createServer() is deprecated, express applications no longer
 inherit from http.Server, please use:

  var express = require("express");
  var app = express();
---
 examples/express-stream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/express-stream.js b/examples/express-stream.js
index 69dc29b4..a19cb03c 100644
--- a/examples/express-stream.js
+++ b/examples/express-stream.js
@@ -1,7 +1,7 @@
 var express = require('express'),
   ffmpeg = require('../index');
 
-var app = express.createServer();
+var app = express();
 
 app.use(express.static(__dirname + '/flowplayer'));