[FFmpeg-cvslog] r22577 - trunk/libavfilter/vf_format.c

[koorogi]

Author: koorogi
Date: Wed Mar 17 05:37:40 2010
New Revision: 22577

Log:
Allow format and noformat filters to be more completely disabled when the
other is enabled.

Modified:
   trunk/libavfilter/vf_format.c

Modified: trunk/libavfilter/vf_format.c
==============================================================================
--- trunk/libavfilter/vf_format.c	Wed Mar 17 05:37:36 2010	(r22576)
+++ trunk/libavfilter/vf_format.c	Wed Mar 17 05:37:40 2010	(r22577)
@@ -106,6 +106,7 @@ static void draw_slice(AVFilterLink *lin
     avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
 }
 
+#if CONFIG_FORMAT_FILTER
 static int query_formats_format(AVFilterContext *ctx)
 {
     avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
@@ -133,7 +134,9 @@ AVFilter avfilter_vf_format = {
                                     .type            = CODEC_TYPE_VIDEO },
                                   { .name = NULL}},
 };
+#endif /* CONFIG_FORMAT_FILTER */
 
+#if CONFIG_NOFORMAT_FILTER
 static int query_formats_noformat(AVFilterContext *ctx)
 {
     avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
@@ -161,3 +164,5 @@ AVFilter avfilter_vf_noformat = {
                                     .type            = CODEC_TYPE_VIDEO },
                                   { .name = NULL}},
 };
+#endif /* CONFIG_NOFORMAT_FILTER */
+