* commit 'bee2d75b':
  avconv: update to the new options syntax.

Conflicts:
	ffmpeg_filter.c

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