videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avfilter/vf_maskedmerge: ignore SAR from all inputs 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-11-12 11:43:06 +01:00
parent a28e70beab
commit 789731affa
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavfilter/vf_maskedmerge.c
View File

@ -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);
}