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

Unified · Split

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

Keyboard shortcuts