* commit '77bd1bc7':
  avconv: use new options parser.

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