* commit 'b114f6d4':
  avconv: factor out flushing the filters

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