Fixes #8252
Unified · Split
| @@ -290,9 +290,9 @@ static int query_formats(AVFilterContext *ctx) · 289 unmodified lines | ||
| 290 | 290 | WaveformContext *s = ctx->priv; |
| 291 | 291 | const enum AVPixelFormat *out_pix_fmts; |
| 292 | 292 | const enum AVPixelFormat *in_pix_fmts; |
| 293 | − const AVPixFmtDescriptor *desc; | |
| 294 | − AVFilterFormats *avff; | |
| 295 | − int depth, rgb, i, ret, ncomp; | |
| 293 | + const AVPixFmtDescriptor *desc, *desc2; | |
| 294 | + AVFilterFormats *avff, *avff2; | |
| 295 | + int depth, depth2, rgb, i, ret, ncomp, ncomp2; | |
| 296 | 296 | |
| 297 | 297 | if (!ctx->inputs[0]->in_formats || |
| 298 | 298 | !ctx->inputs[0]->in_formats->nb_formats) { |
| @@ -316,10 +316,16 @@ static int query_formats(AVFilterContext *ctx) · 17 unmodified lines | ||
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | avff = ctx->inputs[0]->in_formats; |
| 319 | + avff2 = ctx->inputs[0]->out_formats; | |
| 319 | 320 | desc = av_pix_fmt_desc_get(avff->formats[0]); |
| 321 | + desc2 = av_pix_fmt_desc_get(avff2->formats[0]); | |
| 320 | 322 | ncomp = desc->nb_components; |
| 323 | + ncomp2 = desc2->nb_components; | |
| 321 | 324 | rgb = desc->flags & AV_PIX_FMT_FLAG_RGB; |
| 322 | 325 | depth = desc->comp[0].depth; |
| 326 | + depth2 = desc2->comp[0].depth; | |
| 327 | + if (ncomp != ncomp2 || depth != depth2) | |
| 328 | + return AVERROR(EAGAIN); | |
| 323 | 329 | for (i = 1; i < avff->nb_formats; i++) { |
| 324 | 330 | desc = av_pix_fmt_desc_get(avff->formats[i]); |
| 325 | 331 | if (rgb != (desc->flags & AV_PIX_FMT_FLAG_RGB) || |