[FFmpeg-cvslog] Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 28 23:59:15 2012 +0100| [8c1f98d9542d3463f46a3953eb0dd028a1e1b66f] | committer: Michael Niedermayer

Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
  lavfi: remove vf_slicify

Conflicts:
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_slicify.c
	tests/lavfi-regression.sh
	tests/ref/lavfi/crop_scale_vflip

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

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