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

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