* commit '67f2a688':
  avconv: remove a write-only variable

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