* commit '73ed8558':
  avconv: simplify exit_program() by using more local vars

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