Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:18:18 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:24:48 +0000 (23:24 +0200)
commitb3fb2d8cec91dadf935832f3bef97bf5a3a11352
tree5cd66817a72919b0dd0ceaa55713959ad7a7a259
parent7e99ccf5d8c25d7fe670d9402349b055c0c1449a
parent95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e
Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
  vf_select: switch to an AVOptions-based system.

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

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