ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sun Nov 12 11:43:06 2017 +0100| [789731affa81f7c7c11ae96e9ad89e6dfbef9ad3] | committer: Paul B Mahol
avfilter/vf_maskedmerge: ignore SAR from all inputs Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=789731affa81f7c7c11ae96e9ad89e6dfbef9ad3 --- libavfilter/vf_maskedmerge.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index d31b92659e..86559abdac 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -199,27 +199,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 != overlay->w || - base->h != overlay->h || - base->sample_aspect_ratio.num != overlay->sample_aspect_ratio.num || - base->sample_aspect_ratio.den != overlay->sample_aspect_ratio.den || - base->w != mask->w || - base->h != mask->h || - base->sample_aspect_ratio.num != mask->sample_aspect_ratio.num || - base->sample_aspect_ratio.den != mask->sample_aspect_ratio.den) { + if (base->w != overlay->w || base->h != overlay->h || + base->w != mask->w || base->h != mask->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 (size %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, overlay->w, overlay->h, - overlay->sample_aspect_ratio.num, - overlay->sample_aspect_ratio.den, - ctx->input_pads[2].name, mask->w, mask->h, - mask->sample_aspect_ratio.num, - mask->sample_aspect_ratio.den); + ctx->input_pads[2].name, mask->w, mask->h); return AVERROR(EINVAL); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
