From c0bc2fed8ebe6de232639de2f2a221e5ea067183 Mon Sep 17 00:00:00 2001 From: Bobby Bingham Date: Wed, 17 Mar 2010 04:37:40 +0000 Subject: [PATCH] Allow format and noformat filters to be more completely disabled when the other is enabled. Originally committed as revision 22577 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/vf_format.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 1da944d7f8..a501e1a72b 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -106,6 +106,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) 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 */ +