Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 11:07:40 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 11:10:07 +0000 (13:10 +0200)
* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
libavfilter/vf_lut.c

See: d7e95ccd9ff3e55e194582a105421fa308a83ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/vf_lut.c

Simple merge