Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:25:31 +0000 (16:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:30:29 +0000 (16:30 +0100)
commitafa442c198fcbfe587887a4318d61e19539afc2d
treee4ee4899f4ecb5eae12f1b25172e67bd016419f5
parentecb5b9c098009787e02f6de9e2d3e1786531c2f2
parenta220b07b0f971f88213aef012aea51af2800be62
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

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

Conflicts:
ffmpeg.c

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