[FFmpeg-cvslog] avutil/hwcontext_d3d12va: cast the input pointer array argument on av_image_copy calls

James Almer git at videolan.org
Thu Dec 21 15:31:28 EET 2023


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 21 09:29:00 2023 -0300| [4d78a9ac1488b1a5f0ac7b3471ce7dab266872cd] | committer: James Almer

avutil/hwcontext_d3d12va: cast the input pointer array argument on av_image_copy calls

Removes -Wincompatible-pointer-types warnings.

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavutil/hwcontext_d3d12va.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c
index 4995518dbd..cc50d2a5fa 100644
--- a/libavutil/hwcontext_d3d12va.c
+++ b/libavutil/hwcontext_d3d12va.c
@@ -473,7 +473,7 @@ static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
         DX_CHECK(ID3D12Resource_Map(s->staging_download_buffer, 0, NULL, (void **)&mapped_data));
         av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
 
-        av_image_copy(dst->data, dst->linesize, data, linesizes,
+        av_image_copy(dst->data, dst->linesize,  (const uint8_t **)data, linesizes,
                       ctx->sw_format, ctx->width, ctx->height);
 
         ID3D12Resource_Unmap(s->staging_download_buffer, 0, NULL);
@@ -491,7 +491,7 @@ static int d3d12va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
         DX_CHECK(ID3D12Resource_Map(s->staging_upload_buffer, 0, NULL, (void **)&mapped_data));
         av_image_fill_pointers(data, ctx->sw_format, ctx->height, mapped_data, linesizes);
 
-        av_image_copy(data, linesizes, src->data, src->linesize,
+        av_image_copy(data, linesizes,  (const uint8_t **)src->data, src->linesize,
                       ctx->sw_format, ctx->width, ctx->height);
 
         ID3D12Resource_Unmap(s->staging_upload_buffer, 0, NULL);



More information about the ffmpeg-cvslog mailing list