* commit 'a42d6e6c':
  vsrc_movie: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>