* commit '81688e68':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

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