-
Michael Niedermayer authored
* commit 'a220b07b': avconv: split printing the final statistics into a separate function Conflicts: ffmpeg.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
afa442c1
* commit 'a220b07b': avconv: split printing the final statistics into a separate function Conflicts: ffmpeg.c Merged-by:Michael Niedermayer <michaelni@gmx.at>