[FFmpeg-cvslog] Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 10:51:59 2013 +0200| [d5e5e73c52d3e2e1d853b2d485223d3c7b01da4f] | committer: Michael Niedermayer

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

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