Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:43:19 +0000 (13:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 11:43:19 +0000 (13:43 +0200)
* commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27':
  buffersrc: switch to an AVOptions-based system.

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

Commit not merged, merge left to maintainer.

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

Trivial merge