[FFmpeg-cvslog] avfilter/vf_maskedmerge: Remove always-false format check

Andreas Rheinhardt git at videolan.org
Tue Sep 21 19:50:15 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Sep 21 06:09:26 2021 +0200| [406552155a180ddd16e4eca6681016840a2662fd] | committer: Andreas Rheinhardt

avfilter/vf_maskedmerge: Remove always-false format check

This filter uses ff_set_common_formats_from_list().

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=406552155a180ddd16e4eca6681016840a2662fd
---

 libavfilter/vf_maskedmerge.c | 5 -----
 1 file changed, 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 "



More information about the ffmpeg-cvslog mailing list