Skip to content

F
ffmpeg.wasm-core
Commit 79aa9d8a authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avfilter/vf_blend: ignore SAR from all inputs 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 19d2108a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
libavfilter/vf_blend.c
View file @ 79aa9d8a
...@@ -524,19 +524,12 @@ static int config_output(AVFilterLink *outlink) ...@@ -524,19 +524,12 @@ static int config_output(AVFilterLink *outlink)
av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (toplink->w != bottomlink->w || if (toplink->w != bottomlink->w || toplink->h != bottomlink->h) {
toplink->h != bottomlink->h ||
toplink->sample_aspect_ratio.num != bottomlink->sample_aspect_ratio.num ||
toplink->sample_aspect_ratio.den != bottomlink->sample_aspect_ratio.den) {
av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
"(size %dx%d, SAR %d:%d) do not match the corresponding " "(size %dx%d) do not match the corresponding "
"second input link %s parameters (%dx%d, SAR %d:%d)\n", "second input link %s parameters (size %dx%d)\n",
ctx->input_pads[TOP].name, toplink->w, toplink->h, ctx->input_pads[TOP].name, toplink->w, toplink->h,
toplink->sample_aspect_ratio.num, ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h);
toplink->sample_aspect_ratio.den,
ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h,
bottomlink->sample_aspect_ratio.num,
bottomlink->sample_aspect_ratio.den);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment