Fix onCodecData for newer ffmpeg #83

Merged
merged 2 commits into from Nov 28, 2012

2 participants

@xaiki

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

xaiki added some commits Nov 19, 2012
@xaiki xaiki fix for newer ffmpeg
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>
7b24f69
@xaiki xaiki Process more (format, duration, extended {audio,video})
this patch tries to extract more data out of the ffmpeg output
we get duration, format data, all of the audio and video line.
for compatibility audio and video are exactly as they used to be.

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
e848639
@schaermu schaermu merged commit 6b2e4fd into fluent-ffmpeg:master Nov 28, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment