[FFmpeg-cvslog] Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 16:08:01 2014 +0100| [13278b97aeb215a7f5ff75bf41485c2c5ebaf5d4] | committer: Michael Niedermayer

Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
	ffmpeg.c

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

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