Cosmetics: rearrange functions to simplify ifdeffery

Originally committed as revision 22576 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index d9f102d..1da944d 100644 (file)
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@ -85,18 +85,6 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag)
     return formats;
 }
 
-static int query_formats_format(AVFilterContext *ctx)
-{
-    avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
-    return 0;
-}
-
-static int query_formats_noformat(AVFilterContext *ctx)
-{
-    avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
-    return 0;
-}
-
 static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
                                         int w, int h)
 {
@@ -118,6 +106,12 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
     avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
 }
 
+static int query_formats_format(AVFilterContext *ctx)
+{
+    avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
+    return 0;
+}
+
 AVFilter avfilter_vf_format = {
     .name      = "format",
     .description = "Convert the input video to one of the specified pixel formats.",
@@ -140,6 +134,12 @@ AVFilter avfilter_vf_format = {
                                   { .name = NULL}},
 };
 
+static int query_formats_noformat(AVFilterContext *ctx)
+{
+    avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
+    return 0;
+}
+
 AVFilter avfilter_vf_noformat = {
     .name      = "noformat",
     .description = "Force libavfilter not to use any of the specified pixel formats for the input to the next filter.",