[SCM] libav/experimental: 1/PHIl: swap again settb/setpts, fix alphabetical order.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6f2325e3f10974c171f5831d2f68590b623d7899
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Nov 2 22:53:18 2010 +0000

    1/PHIl: swap again settb/setpts, fix alphabetical order.
    
    Originally committed as revision 25657 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 9dc92be..f5465b2 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);

-- 
Libav/FFmpeg packaging