Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 13:27:40 +0000 (15:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 13:37:21 +0000 (15:37 +0200)
commit43bac121d3de0076e76e6f8438934d53f2707ce2
tree30b2ed942e6a8790baf2ba26e7153a33d6704986
parent2a2a643c90ff091f1fa4a0634bcc4e18639bcee0
parent62dcdb028cc84845fd263bb09304c4c6500bda7a
Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'

* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
  vf_blackframe: switch to an AVOptions-based system.
  vf_aspect: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c

In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.

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