From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CB7244CB0C for ; Thu, 7 Aug 2025 23:17:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1164168CB95; Fri, 8 Aug 2025 02:16:56 +0300 (EEST) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C897868BB90 for ; Fri, 8 Aug 2025 02:16:49 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-23fd91f2f8bso11349995ad.3 for ; Thu, 07 Aug 2025 16:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754608607; x=1755213407; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2t1y+B/rmPxWimZgR30dbvRhSemy8wGl/u6gCxmYimE=; b=kpvmp/LCn9BXdIXRo8Nqzj6ocx34h/JxLVOCz383XnvOzuq5tNg9tFcOZlsy9AoWKj 354RTc/Vmp8ls045x9sWfEqgdEVuSn5VJe9Rj5mZVM+YPLimGdvyXwqs71/tOokBNEx7 FEr/DLIeNKbIBKuNkwEGtP7MT5tDQ4lCkMEgRwEszIOrSOF5S8ZqiHwiue5TtzNuKAw/ Um5k6VR4yjHTZoVMUmJxbqTqrM/mES6WgD5VmF55LEXIstu+HAdWRPgkoW9wbWvm3Pk4 aYyb63p47zff1ZWnZK4pWmlLN0RGRHyUrtRV5O2GpU3XKcQd2YaKr3GTZiuH4kEyvp1x KC3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754608607; x=1755213407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2t1y+B/rmPxWimZgR30dbvRhSemy8wGl/u6gCxmYimE=; b=gG4rX5G/ei1gxlSBdD3hm9Pz2QDlws4jbO3GOPzjBcKcovtic654N86bzNUJoXkdDV /C7zgNTDRG1hTfWY0Fxa14KDiausWV1GNzqnzvnf/zlGSz4drw0sSolRJCMqJ6ynQ2VG 8iQCVYn6Jwwc27WaWUemHQNu/wz18LZHR0/RyiW3Av63z2ocJahbTFcpEJydtiuB1cp5 979WYHjPOH031sBXeAWBA+36Zidl1dXNDGc/hXprSNdbbYg2dnGBG8Fvwr7c7W7zBZwU eL+X4k5Hbv9MxeOKVydJOZnKATc9HWGYZ4Pv2G3EY6kz4du1XyLpujVUGRmB70nH0tpG vl4g== X-Gm-Message-State: AOJu0YygJaoWURo8Uxs+SFUmdKPNIzSKZXPgCG6tZ80OOLugXblqtfZt ERdy+hsLIwejbN2gxN21qNWV86VtPzps8bg5brZ/MP+EnUM/pvIWoY/ynFMqtg== X-Gm-Gg: ASbGncvS+waxTqfoiOGbpknHO2sR3ujZBp7BtCRZoPYck8zZAtdqAxGE+UDo5gQ7z7X +PU7BpSsA4i5yQa+Hk1BH3J+ikzfNK8hnloOU6N+cl0eO2eadPXJ3V/uttF34CshWhaaPleNDfn 8oS75OeTqZ8otXt0t97tlUc911hUMihpdY7aX/Cgusp6lNYH2sJdbDuj5u8Yh0EnRHNxQy333Cs 1I0dQF8Rmhs20redroy/aSbR1GISAeWdqKtsiolU0/3muoLjCdLVml0duh1QIE+LDc0vfFhqo7E bOjzkB847JpNtCF7AyXgban96W9JawdAXEXCxezE1Joq1UGsR6Sis86nJbmXcN23sD35vElQ87x /2mwcXmQP5PAJuFD3ogDzzuvGY1SwLnD6lF2Rxr/a X-Google-Smtp-Source: AGHT+IHZzmzOsBMYQ/yk3MRRPpr2Hd2GNh2l8ri4/RVuJ4+ZdwG5G48OWzzaxHEC/6RBdaaB69TY7g== X-Received: by 2002:a17:902:d50e:b0:242:9bbc:6017 with SMTP id d9443c01a7336-242c2276a77mr9606725ad.55.1754608607432; Thu, 07 Aug 2025 16:16:47 -0700 (PDT) Received: from JESTRADA-PC.localdomain ([98.97.30.252]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef6832sm193834595ad.25.2025.08.07.16.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Aug 2025 16:16:47 -0700 (PDT) From: Jorge Estrada To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Aug 2025 16:14:17 -0700 Message-Id: <20250807231416.34930-1-jestrada.list@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250807195800.77462-1-jestrada.list@gmail.com> References: <20250807195800.77462-1-jestrada.list@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] use av_buffer_replace X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jorge Estrada Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Addressed. Uses av_buffer_replace now --- libavfilter/vf_alphamerge.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index f5779484a9..69c0dd04ea 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -28,12 +28,12 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixfmt.h" +#include "libavutil/frame.h" #include "avfilter.h" #include "drawutils.h" #include "formats.h" #include "filters.h" #include "framesync.h" -#include "video.h" enum { Y, U, V, A }; @@ -78,11 +78,21 @@ static int do_alphamerge(FFFrameSync *fs) } } } else { - const int main_linesize = main_buf->linesize[A]; - const int alpha_linesize = alpha_buf->linesize[Y]; - av_image_copy_plane(main_buf->data[A], main_linesize, - alpha_buf->data[Y], alpha_linesize, - FFMIN(main_linesize, alpha_linesize), alpha_buf->height); + AVBufferRef *alpha_plane_buf = av_frame_get_plane_buffer(alpha_buf, Y); + + if (!alpha_plane_buf) { + av_log(ctx, AV_LOG_ERROR, "Could not get buffer for alpha plane.\n"); + return AVERROR(EINVAL); + } + + ret = av_buffer_replace(&main_buf->buf[A], alpha_plane_buf); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to replace alpha plane buffer.\n"); + return ret; + } + + main_buf->data[A] = alpha_buf->data[Y]; + main_buf->linesize[A] = alpha_buf->linesize[Y]; } return ff_filter_frame(ctx->outputs[0], main_buf); @@ -212,4 +222,4 @@ const FFFilter ff_vf_alphamerge = { FILTER_QUERY_FUNC2(query_formats), .uninit = uninit, .activate = activate, -}; +}; \ No newline at end of file -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".