diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-02 22:53:18 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-02 22:53:18 +0000 |
| commit | 6f2325e3f10974c171f5831d2f68590b623d7899 (patch) | |
| tree | 4733c627d57d7d63675ffff7502c6d5e4c87719e /libavfilter | |
| parent | d89e3b36e3902da41edbbc5240499d0c41ec46c9 (diff) | |
| download | ffmpeg-6f2325e3f10974c171f5831d2f68590b623d7899.tar.gz | |
1/PHIl: swap again settb/setpts, fix alphabetical order.
Originally committed as revision 25657 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9dc92bec7c..f5465b25d5 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 8ba0b62ace..d30e95aed3 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); |