Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 19:54:13 +0000 (21:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 20:13:34 +0000 (22:13 +0200)
commit8bdb119197ad50a5ede2326e3c0942dc82ba1b5e
treece0330a1a97e2cea6018e76010d41b7dc8fd7b2f
parent94ec709e3bdd37368ecfc2973ff931fa4cb775c0
parent20b46f8f4fff6aeeab9ea418dc359eda8887ced6
Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'

* commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6':
  vf_lut: switch to an AVOptions-based system.

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

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