Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fix onCodecData for newer ffmpeg #83

Merged
merged 2 commits into from Nov 28, 2012
Commits on Nov 19, 2012
  1. fix for newer ffmpeg

    xaiki committed Nov 19, 2012
    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>
  2. Process more (format, duration, extended {audio,video})

    xaiki committed Nov 19, 2012
    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>