Originally committed as revision 21176 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter/avfiltergraph.c (1 of 1 file). Show all
Unified · Split
| @@ -147,11 +147,15 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 146 unmodified lines | |||
| 147 | return -1; | 147 | return -1; |
| 148 | 148 | ||
| 149 | scale->filter->query_formats(scale); | 149 | scale->filter->query_formats(scale); |
| 150 | if(!avfilter_merge_formats(scale-> inputs[0]->in_formats, | 150 | if (((link = scale-> inputs[0]) && |
| 151 | scale-> inputs[0]->out_formats)|| | 151 | !avfilter_merge_formats(link->in_formats, link->out_formats)) || |
| 152 | !avfilter_merge_formats(scale->outputs[0]->in_formats, | 152 | ((link = scale->outputs[0]) && |
| 153 | scale->outputs[0]->out_formats)) | 153 | !avfilter_merge_formats(link->in_formats, link->out_formats))) { |
| 154 | av_log(log_ctx, AV_LOG_ERROR, | ||
| 155 | "Impossible to convert between the formats supported by the filter " | ||
| 156 | "'%s' and the filter '%s'\n", link->src->name, link->dst->name); | ||
| 154 | return -1; | 157 | return -1; |
| 158 | } | ||
| 155 | } | 159 | } |
| 156 | } | 160 | } |
| 157 | } | 161 | } |