Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 08:51:59 +0000 (10:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 08:51:59 +0000 (10:51 +0200)
commitd5e5e73c52d3e2e1d853b2d485223d3c7b01da4f
treee45e9c33d49036e03e84c6bd352ae3c05c5e823a
parent5bc892cb17225c8bfd54c12abf45012f393f03e3
parentd371c3c2e2830d9783465ecfe1ab7d93351083b7
Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'

* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7':
  vf_frei0r: make config_props work properly when called multiple times.
  vf_gradfun: make config_props work properly when called multiple times.
  vf_lut: make config_props work properly when called multiple times.

Conflicts:
libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_lut.c