diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 23:59:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 23:59:15 +0100 |
| commit | 8c1f98d9542d3463f46a3953eb0dd028a1e1b66f (patch) | |
| tree | c71e28f565dc53b276402695ffcc21b95bc0adb9 /libavfilter/allfilters.c | |
| parent | 5ddc072d0ddc7af1fc354d58a22108eb4fc53327 (diff) | |
| parent | bb6c67bb36b136de10256f0999128df4a42f9ffc (diff) | |
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>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 88e8d683c2..746e713287 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -124,7 +124,6 @@ void avfilter_register_all(void) REGISTER_FILTER (SETSAR, setsar, vf); REGISTER_FILTER (SETTB, settb, vf); REGISTER_FILTER (SHOWINFO, showinfo, vf); - REGISTER_FILTER (SLICIFY, slicify, vf); REGISTER_FILTER (SMARTBLUR, smartblur, vf); REGISTER_FILTER (SPLIT, split, vf); REGISTER_FILTER (SUPER2XSAI, super2xsai, vf); |