avfilter/vf_maskedmerge: Remove always-false format check

This filter uses ff_set_common_formats_from_list().

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/369/head
Andreas Rheinhardt 3 years ago
parent 15778ccce6
commit 406552155a
  1. 5
      libavfilter/vf_maskedmerge.c

@ -228,11 +228,6 @@ static int config_output(AVFilterLink *outlink)
FFFrameSyncIn *in; FFFrameSyncIn *in;
int ret; int ret;
if (base->format != overlay->format ||
base->format != mask->format) {
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 || if (base->w != overlay->w || base->h != overlay->h ||
base->w != mask->w || base->h != mask->h) { base->w != mask->w || base->h != mask->h) {
av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "

Loading…
Cancel
Save