summaryrefslogtreecommitdiff
path: root/libavfilter/vf_blend.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-11-12 11:39:16 +0100
committerPaul B Mahol <onemda@gmail.com>2017-11-12 11:39:16 +0100
commit79aa9d8aeee0e164a1af2087f481f69d73969c6b (patch)
treef608e84b393d3de9686e0097b63d50c4f5f61e2f /libavfilter/vf_blend.c
parent19d2108a984f7009e74eeddf883e6bad758a98e6 (diff)
avfilter/vf_blend: ignore SAR from all inputs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_blend.c')
-rw-r--r--libavfilter/vf_blend.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 054c0d55d0..70c37c75da 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -524,19 +524,12 @@ static int config_output(AVFilterLink *outlink)
av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
return AVERROR(EINVAL);
}
- if (toplink->w != bottomlink->w ||
- toplink->h != bottomlink->h ||
- toplink->sample_aspect_ratio.num != bottomlink->sample_aspect_ratio.num ||
- toplink->sample_aspect_ratio.den != bottomlink->sample_aspect_ratio.den) {
+ if (toplink->w != bottomlink->w || toplink->h != bottomlink->h) {
av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
- "(size %dx%d, SAR %d:%d) do not match the corresponding "
- "second input link %s parameters (%dx%d, SAR %d:%d)\n",
+ "(size %dx%d) do not match the corresponding "
+ "second input link %s parameters (size %dx%d)\n",
ctx->input_pads[TOP].name, toplink->w, toplink->h,
- toplink->sample_aspect_ratio.num,
- toplink->sample_aspect_ratio.den,
- ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h,
- bottomlink->sample_aspect_ratio.num,
- bottomlink->sample_aspect_ratio.den);
+ ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h);
return AVERROR(EINVAL);
}
}