* commit '636ced8e':
  cmdutils: wrap exit explicitly

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