[FFmpeg-devel] use av_buffer_replace

[Jorge Estrada <jestrada.list@gmail.com>]

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".