Skip to content

Commit

Permalink
fix for newer ffmpeg
Browse files Browse the repository at this point in the history
The ffmpeg shipped with debian (unstable)
ffmpeg version 0.8.4-6:0.8.4-1, Copyright (c) 2000-2012 the Libav developers
ii  ffmpeg             6:0.8.4-1      amd64          Multimedia player, server, encoder and tr

changes slightly the output from '[q]' to 'ctrl-c',
this breaks the emission of the onCodecData signal.

this simple patch extends the regex to match for both cases.

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
  • Loading branch information
xaiki committed Nov 19, 2012
1 parent 6521924 commit 7b24f69
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/processor.js
Expand Up @@ -407,7 +407,7 @@ exports = module.exports = function Processor(command) {
codecObject.video = video[1]; codecObject.video = video[1];
} }


var codecInfoPassed = /Press \[q\] to stop/.test(stderrString); var codecInfoPassed = /Press (\[q\]|ctrl-c) to stop/.test(stderrString);
if (codecInfoPassed) { if (codecInfoPassed) {
this.options.onCodecData(codecObject); this.options.onCodecData(codecObject);
this.options.onCodecData = null; this.options.onCodecData = null;
Expand Down

0 comments on commit 7b24f69

Please sign in to comment.