[FFmpeg-cvslog] avfilter/vf_maskedclamp: ignore SAR from all inputs
Paul B Mahol
git at videolan.org
Sun Nov 12 13:04:02 EET 2017
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Nov 12 11:19:19 2017 +0100| [2afeb3f8ab0041d470d905102d23080c88d67d92] | committer: Paul B Mahol
avfilter/vf_maskedclamp: ignore SAR from all inputs
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2afeb3f8ab0041d470d905102d23080c88d67d92
---
libavfilter/vf_maskedclamp.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/libavfilter/vf_maskedclamp.c b/libavfilter/vf_maskedclamp.c
index 67a979f8c0..9812e08533 100644
--- a/libavfilter/vf_maskedclamp.c
+++ b/libavfilter/vf_maskedclamp.c
@@ -235,27 +235,15 @@ static int config_output(AVFilterLink *outlink)
av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
return AVERROR(EINVAL);
}
- if (base->w != dark->w ||
- base->h != dark->h ||
- base->sample_aspect_ratio.num != dark->sample_aspect_ratio.num ||
- base->sample_aspect_ratio.den != dark->sample_aspect_ratio.den ||
- base->w != bright->w ||
- base->h != bright->h ||
- base->sample_aspect_ratio.num != bright->sample_aspect_ratio.num ||
- base->sample_aspect_ratio.den != bright->sample_aspect_ratio.den) {
+ if (base->w != dark->w || base->h != dark->h ||
+ base->w != bright->w || base->h != bright->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) "
- "and/or third input link %s parameters (%dx%d, SAR %d:%d)\n",
+ "(size %dx%d) do not match the corresponding "
+ "second input link %s parameters (%dx%d) "
+ "and/or third input link %s parameters (size %dx%d)\n",
ctx->input_pads[0].name, base->w, base->h,
- base->sample_aspect_ratio.num,
- base->sample_aspect_ratio.den,
ctx->input_pads[1].name, dark->w, dark->h,
- dark->sample_aspect_ratio.num,
- dark->sample_aspect_ratio.den,
- ctx->input_pads[2].name, bright->w, bright->h,
- bright->sample_aspect_ratio.num,
- bright->sample_aspect_ratio.den);
+ ctx->input_pads[2].name, bright->w, bright->h);
return AVERROR(EINVAL);
}
More information about the ffmpeg-cvslog
mailing list