Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 22:10:59 +0000 (00:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 22:10:59 +0000 (00:10 +0200)
commit6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3
tree01b5badc0c32d180a63b8b81553cef40407f6884
parent8695d9de4704aa328b6dd0e9826c04da44d04046
parentffea3b00c39caa8ad78456ae08c8353929974dfd
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'

* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
  vf_settb: switch to an AVOptions-based system.

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

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