Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:40:35 +0000 (16:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:40:35 +0000 (16:40 +0100)
commit1046cd60d4b19d6376dd18164959c3ea30477855
treec1f2921d1f0e50bbaeb0a0868e8a1ec88c80dddb
parentafa442c198fcbfe587887a4318d61e19539afc2d
parent4754345027eb85cfa51aeb88beec68d7b036c11e
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h