History

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

Bobby Bingham committed 16 years ago

Commit c0bc2fe1 parent 55fd1bb1 file · +5 −0Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_format.c+5−0
@@ -106,6 +106,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) · 105 unmodified lines
106 avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);106 avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
107}107}
108 108
109#if CONFIG_FORMAT_FILTER
109static int query_formats_format(AVFilterContext *ctx)110static int query_formats_format(AVFilterContext *ctx)
110{111{
111 avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));112 avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
@@ -133,7 +134,9 @@ AVFilter avfilter_vf_format = { · 21 unmodified lines
133 .type = CODEC_TYPE_VIDEO },134 .type = CODEC_TYPE_VIDEO },
134 { .name = NULL}},135 { .name = NULL}},
135};136};
137#endif /* CONFIG_FORMAT_FILTER */
136 138
139#if CONFIG_NOFORMAT_FILTER
137static int query_formats_noformat(AVFilterContext *ctx)140static int query_formats_noformat(AVFilterContext *ctx)
138{141{
139 avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));142 avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
@@ -161,3 +164,5 @@ AVFilter avfilter_vf_noformat = { · 21 unmodified lines
161 .type = CODEC_TYPE_VIDEO },164 .type = CODEC_TYPE_VIDEO },
162 { .name = NULL}},165 { .name = NULL}},
163};166};
167#endif /* CONFIG_NOFORMAT_FILTER */
168

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t