[FFmpeg-cvslog] Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 16:25:31 2014 +0100| [afa442c198fcbfe587887a4318d61e19539afc2d] | committer: Michael Niedermayer

Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
	ffmpeg.c

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

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