[FFmpeg-cvslog] Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 16:40:35 2014 +0100| [1046cd60d4b19d6376dd18164959c3ea30477855] | committer: Michael Niedermayer

Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

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

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1046cd60d4b19d6376dd18164959c3ea30477855
---