Merge remote-tracking branch 'ubitux/shorthand-cleanup'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:28:51 +0000 (23:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:29:05 +0000 (23:29 +0200)
* ubitux/shorthand-cleanup:
  lavfi/subtitles: switch to an AVOptions-based system.
  lavfi/pp: switch to an AVOptions-based system.
  lavfi/geq: switch to an AVOptions-based system.
  lavfi/edgedetect: switch to an AVOptions-based system.
  lavfi/curves: switch to an AVOptions-based system.
  lavfi/colormatrix: switch to an AVOptions-based system.
  lavfi/perms: switch to an AVOptions-based system.
  lavfi/ebur128: switch to an AVOptions-based system.
  lavfi/showspectrum: switch to an AVOptions-based system.
  lavfi/silencedetect: switch to an AVOptions-based system.
  lavfi/thumbnail: switch to an AVOptions-based system.

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

Simple merge
@@@ -680,9 -686,15 +686,16 @@@ int avfilter_init_filter(AVFilterContex
          !strcmp(filter->filter->name, "pad"        ) ||
          !strcmp(filter->filter->name,   "format") ||
          !strcmp(filter->filter->name, "noformat") ||
+         !strcmp(filter->filter->name, "perms")  ||
+         !strcmp(filter->filter->name, "pp"   )  ||
+         !strcmp(filter->filter->name, "aperms") ||
          !strcmp(filter->filter->name, "resample") ||
+         !strcmp(filter->filter->name, "showspectrum") ||
+         !strcmp(filter->filter->name, "silencedetect") ||
+         !strcmp(filter->filter->name, "subtitles") ||
+         !strcmp(filter->filter->name, "thumbnail") ||
  //         !strcmp(filter->filter->name, "scale"      ) ||
 +        !strcmp(filter->filter->name, "select") ||
          0
          ;