-
Michael Niedermayer authored
* commit 'bb6c67bb': 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@gmx.at>
8c1f98d9