From f37c934d20a92d873e2cbb2eb64876177a18d9a0 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 13 Jan 2010 00:09:24 +0000 Subject: Make query_formats() print an error message if an auto-inserted scale filter cannot convert between input and output formats. Originally committed as revision 21176 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfiltergraph.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index d46548e3e2..8fbbecf055 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -147,11 +147,15 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) return -1; scale->filter->query_formats(scale); - if(!avfilter_merge_formats(scale-> inputs[0]->in_formats, - scale-> inputs[0]->out_formats)|| - !avfilter_merge_formats(scale->outputs[0]->in_formats, - scale->outputs[0]->out_formats)) + if (((link = scale-> inputs[0]) && + !avfilter_merge_formats(link->in_formats, link->out_formats)) || + ((link = scale->outputs[0]) && + !avfilter_merge_formats(link->in_formats, link->out_formats))) { + av_log(log_ctx, AV_LOG_ERROR, + "Impossible to convert between the formats supported by the filter " + "'%s' and the filter '%s'\n", link->src->name, link->dst->name); return -1; + } } } } -- cgit v1.2.3