Merge commit 'b85dbe68'

* commit 'b85dbe68':
  avconv: Call exit_program instead of exit in avconv_opt as well

Conflicts:
	ffmpeg_opt.c

See: eeddeb65

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