From patchwork Thu Apr 18 11:58:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12796 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 02242446F04 for ; Thu, 18 Apr 2019 14:58:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB59C68A768; Thu, 18 Apr 2019 14:58:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f176.google.com (mail-it1-f176.google.com [209.85.166.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7248868990D for ; Thu, 18 Apr 2019 14:58:36 +0300 (EEST) Received: by mail-it1-f176.google.com with SMTP id q14so2886832itk.0 for ; Thu, 18 Apr 2019 04:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=2eyx2Zimnq1Fra/X5HAXhnB+BUkvgJ4hxMrTgQ3KvbY=; b=a5ysM40pfWLMsW9a5izmwyWZitq/50FCAazhx6Zd5QGLDLz6E0a0yKm14M7bYEoA9H iC5MPq9BxzJM8IFfqV39ukC93tbaFpZw7Hnmtc0Y4hPGIzCtqmjljaPYXmSV5CXJQi5b ilVVbBs+sqckspj0lGKMexdhWCZcI7SLQuAhd/SOc9EDExJt6tV86PQynH32cQQaTLdc dXC0ZAb2BFsRg2r5t3h2Utscj2Gj5TKj2VumFYBY8ru6YV/LhNxp+1FrGvF6cpWm1ucC kT/fJTtwByl71q2qjC4BMVMLtadTEBRaxKduQyAYV9G9xYpmv8Q8dxIU6359M4gBC3uH A1qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2eyx2Zimnq1Fra/X5HAXhnB+BUkvgJ4hxMrTgQ3KvbY=; b=MC7hqcp/EBaAq1RmMq5u5kX8TX5aMAB22qSGn3BC9cFOD9EEMv994+UFb/mo+K0sM0 WnB4dtE2R+ecYC5zt4TzbdpV0YUPorlsJ9ReMiX9l53uMAC83EmeE2ntwhd3+4b7xm5N CSuBZcF5fRfh4WgqKBusBeWPEAAvDSTg5EE6MjxmXPsNw+WvnvXcE4tGjdwFFImvmOSP vtPJcoCWKYJjdj8UKwnNP4xdNoEawS2Ebb2Cc45DJKW9gysKchmR1CRY2TPPz0Mi705+ iCp5gcJ7lrbEjeTLj4qduGALmy8aNbE95226061faCH9KV1hRubLmBzsNXG2oMSl8K2a m5Tg== X-Gm-Message-State: APjAAAUcgr9V+AAxTbaAVrXcjoq22c75FWrUdwgocVjONtpHu5yaQ2zr 5Q+7dZAXPqO3YA55LKf9rZunQn8SpSszjulAmLSKZw== X-Google-Smtp-Source: APXvYqxDOtf8QdWzksJkJJEPWauX6qzitSlQrDm2NLp42ZRn9UaOxJCA4aU9AkFv586Kq9UsEYDKm7QPFHPS6FSucDI= X-Received: by 2002:a02:ab95:: with SMTP id t21mr63217394jan.89.1555588714869; Thu, 18 Apr 2019 04:58:34 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:5503:0:0:0:0:0 with HTTP; Thu, 18 Apr 2019 04:58:34 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 18 Apr 2019 13:58:34 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavu/hwcontext_d3d: Cast a pointer calling av_image_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch silences several warnings when compiling for win32. Please comment, Carl Eugen From e9f39015d5796dbbd59565a99df54eff31dc885f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 18 Apr 2019 13:55:29 +0200 Subject: [PATCH] lavu/hwcontext_d3d: Cast a pointer calling av_image_copy(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Silences several warnings: libavutil/hwcontext_d3d11va.c:413:49: warning: passing argument 3 of ‘av_image_copy’ from incompatible pointer type libavutil/hwcontext_d3d11va.c:425:47: warning: passing argument 3 of ‘av_image_copy’ from incompatible pointer type libavutil/hwcontext_dxva2.c:351:45: warning: passing argument 3 of ‘av_image_copy’ from incompatible pointer type libavutil/hwcontext_dxva2.c:382:52: warning: passing argument 3 of ‘av_image_copy_uc_from’ from incompatible pointer type --- libavutil/hwcontext_d3d11va.c | 4 ++-- libavutil/hwcontext_dxva2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 41330f0..6670c47 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -410,7 +410,7 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, fill_texture_ptrs(map_data, map_linesize, ctx, &desc, &map); - av_image_copy(dst->data, dst->linesize, map_data, map_linesize, + av_image_copy(dst->data, dst->linesize, (const uint8_t **)map_data, map_linesize, ctx->sw_format, w, h); ID3D11DeviceContext_Unmap(device_hwctx->device_context, staging, 0); @@ -422,7 +422,7 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, fill_texture_ptrs(map_data, map_linesize, ctx, &desc, &map); - av_image_copy(map_data, map_linesize, src->data, src->linesize, + av_image_copy(map_data, map_linesize, (const uint8_t **)src->data, src->linesize, ctx->sw_format, w, h); ID3D11DeviceContext_Unmap(device_hwctx->device_context, staging, 0); diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 4585f32..64366ce 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -348,7 +348,7 @@ static int dxva2_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, if (ret < 0) goto fail; - av_image_copy(map->data, map->linesize, src->data, src->linesize, + av_image_copy(map->data, map->linesize, (const uint8_t **)src->data, src->linesize, ctx->sw_format, src->width, src->height); fail: @@ -379,7 +379,7 @@ static int dxva2_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, dst_linesize[i] = dst->linesize[i]; src_linesize[i] = map->linesize[i]; } - av_image_copy_uc_from(dst->data, dst_linesize, map->data, src_linesize, + av_image_copy_uc_from(dst->data, dst_linesize, (const uint8_t **)map->data, src_linesize, ctx->sw_format, src->width, src->height); fail: av_frame_free(&map); -- 1.7.10.4