aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-09-21 06:09:26 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-09-21 17:57:02 +0200
commit406552155a180ddd16e4eca6681016840a2662fd (patch)
tree1af311b588e16709ca2e53c1ce4eaf97599bfad7
parent15778ccce62bcb9ff19054a3c5ab0fa41e87e3bc (diff)
downloadffmpeg-406552155a180ddd16e4eca6681016840a2662fd.tar.gz
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>
-rw-r--r--libavfilter/vf_maskedmerge.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c
index 00e9308622..26b54830b8 100644
--- a/libavfilter/vf_maskedmerge.c
+++ b/libavfilter/vf_maskedmerge.c
@@ -228,11 +228,6 @@ static int config_output(AVFilterLink *outlink)
FFFrameSyncIn *in;
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 ||
base->w != mask->w || base->h != mask->h) {
av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "