diff options
| author | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-17 04:37:40 +0000 |
|---|---|---|
| committer | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-17 04:37:40 +0000 |
| commit | c0bc2fed8ebe6de232639de2f2a221e5ea067183 (patch) | |
| tree | 413c42db16d3353a64d37efcd115177046a6a972 /libavfilter | |
| parent | 55fd1bbc1b00eb8874404074fc4fe98bf4a53a79 (diff) | |
| download | ffmpeg-c0bc2fed8ebe6de232639de2f2a221e5ea067183.tar.gz | |
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
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_format.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ + |