From patchwork Sun Apr 15 22:00:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 8455 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp178738jad; Sun, 15 Apr 2018 15:00:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx49ZXjBbPtQF2on8A9QNztBK/Uhv8RoEqQ+RtgpBr7yEVMeFY6MXApgy06LuHJS7v0kUmeNt X-Received: by 10.223.176.29 with SMTP id f29mr330496wra.39.1523829648629; Sun, 15 Apr 2018 15:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523829648; cv=none; d=google.com; s=arc-20160816; b=Aufm1qT3WX9lEIjF4KOmMN+Gl0uhBtch1ckVXsbIOdvUT5k/ipt6q7wMEfmn3myq0P 1OAGCitUVptaoXkK9HLBczKs/VGoKkwJ4Pwu6l01NnEXnvnKZN9jZCx22lUIpi25oZqd T5IOO5AxWF3kmz6fj4dHJTSOslR7g+h8J08g9eWKVj9xRMbo2XeWWerkSVSyie6YwEjH 4UqZcgEAQklljirXPE2Ghyi1Z3zY6mh6F5YBTT7MLwZ3kERqu+42yiq5MQJYrYXXDnNN UMuOM4DEifLCVkZxqUvUwAmq7r2bkZMR3/r6seQDzrW4q+taJDaBZ9FeDpEhXWYffdwK 6+8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=2iovN0CnVdt+df+xxzSbKYb2EF+5GRcDC4vOqB+xJqs=; b=M8uT8VEun4WwTBPiqlK+XbWWJl2LWtuYatzO9aLz1WW7Dqzk7wWQzdRIv6v2cNL0C2 HtS7+CB5KmcAyUO7sqOFeafWvz9R+4XYglfhOBHhIs47ioEahB9dOpMzDUKSELO73k3z zESlCKuy0cFHcfVfej9H71GwuGV+eVVDIAE9eSHSge2CZZHcmbN5nVYH0gteWp28fIfA yTSGIrnuPoijjjYFRkeRom38GGnqJnCsXIPxGpWM58dkaEDqA35I7uI0nfRuyQpILfW4 Ywo8UitSKZTX3KcYobqBzigG9Mr3UxMlgm748RgLj7nY/z0Y1BQj/0uB8IGTzMAT5rok gFYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iwRF1jKa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i84si4019245wmc.198.2018.04.15.15.00.47; Sun, 15 Apr 2018 15:00:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iwRF1jKa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18A08689A46; Mon, 16 Apr 2018 01:00:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C1EE689784 for ; Mon, 16 Apr 2018 01:00:13 +0300 (EEST) Received: by mail-it0-f47.google.com with SMTP id 19-v6so9285676itw.3 for ; Sun, 15 Apr 2018 15:00:39 -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=tQpQWEgJvIRY/FpX4jsrwPfVSnB1bmv5WfHUnJ/oruI=; b=iwRF1jKa5zhK3FFP3ddBSm3ld1cMXL0oN5AYTIGDeDAwmWH8tlVrse2Sr2l3+WNf0G JuMxYK/3RXRGhpjok4O0AFYpl6qfOKj6lr4YqrdfmPlpTms0SiJj1P3kWo01TrPsPlz9 +wLYhJP77GVjZJM5URLW+sYo8/Pa3jgbZRJ905DL/yUPYBQOk21HN2vur6RFLhgnN95Y H8tsvZbumBrmxpzoUuzPeRyeqZqCLsrkkf+vgVWddmO/LDWCmd2e2lxr8rv6g1OLLHdi K2nWLSQhQgDnhP9cvqQTkpilt07B/e/RZoZqZJP/7HcS8in6bin8GxOboMlqitEmvX48 3Msg== 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=tQpQWEgJvIRY/FpX4jsrwPfVSnB1bmv5WfHUnJ/oruI=; b=pRfRDt2AoOYybB2TxvcBkCuUjuvcJCUe7TVxrvn3ak7tVBC3lVzNv/TPiKpLqH7fSg a3MIU3Gc55fsHfZ9TmORCGC+2eYXGohVvxxm5Q/EgYPxWwx4lEpe9xifji+4U6Vzcrry yaNpFD7xvRymeQgQMjo/M/+++fmCS/fFa3s+lql4/LykGHKYsvNntbhntAsxjV2GpYfL PnPi3euLZLuXJYetouhVfL7JxbsSjxuuAv2MCiBIODX67PDbNVw6MD+HWT5PLJw+VNFN z33l0EwUgIkzvWPadfIrrMFncM0SdIChc37CagVQNbne7h3GzcIp3hwXSi4zQvvrrtVV eyIQ== X-Gm-Message-State: ALQs6tBCx5hcj9m11Zvbs+tUuWp4X7jm9zQ7f8IMPeBgpi+55UVXm+Hl F9D78VYYgZwmekn2IF2FvSw/5x7p/BC6IzjisLI= X-Received: by 2002:a24:33c3:: with SMTP id k186-v6mr14087005itk.5.1523829638069; Sun, 15 Apr 2018 15:00:38 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.3.78 with HTTP; Sun, 15 Apr 2018 15:00:37 -0700 (PDT) From: Carl Eugen Hoyos Date: Mon, 16 Apr 2018 00:00:37 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/dxva2_internal: Cast dxva2 and d3d11 decoders and cfgs to (void *) 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 is supposed to silence several user-reported warnings, I cannot currently test here. Please review, Carl Eugen From 6fb20352568dc5abe61c28247bfce9e04e7494c1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 15 Apr 2018 23:57:24 +0200 Subject: [PATCH] lavc/dxva2_internal: Cast the dxva2 and d3d11 decoders and cfgs to (void *). Silences several warnings: libavcodec/dxva2_internal.h:107:98: warning: pointer type mismatch in conditional expression libavcodec/dxva2_internal.h:109:94: warning: pointer type mismatch in conditional expression --- libavcodec/dxva2_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 8bb3344..b822af5 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -104,9 +104,9 @@ typedef struct FFDXVASharedContext { #if CONFIG_D3D11VA && CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.workaround : ctx->dxva2.workaround) #define DXVA_CONTEXT_COUNT(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.surface_count : ctx->dxva2.surface_count) -#define DXVA_CONTEXT_DECODER(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.decoder : ctx->dxva2.decoder) +#define DXVA_CONTEXT_DECODER(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? (void *)ctx->d3d11va.decoder : (void *)ctx->dxva2.decoder) #define DXVA_CONTEXT_REPORT_ID(avctx, ctx) (*(ff_dxva2_is_d3d11(avctx) ? &ctx->d3d11va.report_id : &ctx->dxva2.report_id)) -#define DXVA_CONTEXT_CFG(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.cfg : ctx->dxva2.cfg) +#define DXVA_CONTEXT_CFG(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? (void *)ctx->d3d11va.cfg : (void *)ctx->dxva2.cfg) #define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.cfg->ConfigBitstreamRaw : ctx->dxva2.cfg->ConfigBitstreamRaw) #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.cfg->ConfigIntraResidUnsigned : ctx->dxva2.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ff_dxva2_is_d3d11(avctx) ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator) -- 1.7.10.4