Michael Niedermayer 1046cd60d4 Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' ...

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

Conflicts:
	ffmpeg.c

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

2014-03-24 16:40:35 +01:00

15 KiB

Raw Blame History

View Raw