[FFmpeg-cvslog] Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 00:10:59 2013 +0200| [6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3
---