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

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