Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Nov 2012 22:59:15 +0000 (23:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Nov 2012 22:59:15 +0000 (23:59 +0100)
commit8c1f98d9542d3463f46a3953eb0dd028a1e1b66f
treec71e28f565dc53b276402695ffcc21b95bc0adb9
parent5ddc072d0ddc7af1fc354d58a22108eb4fc53327
parentbb6c67bb36b136de10256f0999128df4a42f9ffc
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@gmx.at>
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip