Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:38:34 +0000 (03:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:41:08 +0000 (03:41 +0200)
commit3a3d984445f0e49e692f712ebb51a4b7e6bb006c
tree7c7df400fe0f47c341391639d29b7c0ac89832d7
parent670e0f7f66207227d70898b07fe0eace767cd027
parenta42d6e6c4c19912b73cae8ca9133b4202667c303
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

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

Conflicts:
doc/filters.texi
libavfilter/src_movie.c

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