RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 17:21:05 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_maskedclamp: ignore SAR from all inputs

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-11-12 11:19:19 +01:00
parent 6c0509ae86
commit 2afeb3f8ab
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_maskedclamp.c
View File

@ -235,27 +235,15 @@ 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 (base->w != dark->w || if (base->w != dark->w || base->h != dark->h ||
base->h != dark->h || base->w != bright->w || base->h != bright->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) {
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) " "second input link %s parameters (%dx%d) "
"and/or third input link %s parameters (%dx%d, SAR %d:%d)\n", "and/or third input link %s parameters (size %dx%d)\n",
ctx->input_pads[0].name, base->w, base->h, 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, ctx->input_pads[1].name, dark->w, dark->h,
dark->sample_aspect_ratio.num, ctx->input_pads[2].name, bright->w, bright->h);
dark->sample_aspect_ratio.den,
ctx->input_pads[2].name, bright->w, bright->h,
bright->sample_aspect_ratio.num,
bright->sample_aspect_ratio.den);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }