From 6f2325e3f10974c171f5831d2f68590b623d7899 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 2 Nov 2010 22:53:18 +0000 Subject: 1/PHIl: swap again settb/setpts, fix alphabetical order. Originally committed as revision 25657 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/Makefile | 2 +- libavfilter/allfilters.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9dc92be..f5465b25d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -36,8 +36,8 @@ OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o -OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o +OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 8ba0b62..d30e95a 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -56,8 +56,8 @@ void avfilter_register_all(void) REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf); REGISTER_FILTER (PIXELASPECT, pixelaspect, vf); REGISTER_FILTER (SCALE, scale, vf); - REGISTER_FILTER (SETTB, settb, vf); REGISTER_FILTER (SETPTS, setpts, vf); + REGISTER_FILTER (SETTB, settb, vf); REGISTER_FILTER (SLICIFY, slicify, vf); REGISTER_FILTER (TRANSPOSE, transpose, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); -- cgit v1.1