Merge remote-tracking branch 'ubitux/shorthand-cleanup'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 22:37:21 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 22:37:32 +0000 (00:37 +0200)
* ubitux/shorthand-cleanup:
  lavfi/mptestsrc: switch to an AVOptions-based system.
  lavfi/mandelbrot: switch to an AVOptions-based system.
  lavfi/life: switch to an AVOptions-based system.
  lavfi/cellauto: switch to an AVOptions-based system.

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

Simple merge
Simple merge