[FFmpeg-cvslog] Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  1 13:07:40 2013 +0200| [67d7ea9825f6c3dfae5323c5252dbc602acddd1d] | committer: Michael Niedermayer

Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'

* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
	libavfilter/vf_lut.c

See: d7e95ccd9ff3e55e194582a105421fa308a83ef1
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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