From patchwork Mon Jul 23 23:47:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 9780 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp6295321jad; Mon, 23 Jul 2018 16:54:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeRJxqKuVy2xPdxXl6KGGRFqOP3ankHN0wEg0zamq8KjWkLkpR2hGLgqdttQS8FYJdDjbuq X-Received: by 2002:adf:8362:: with SMTP id 89-v6mr10313604wrd.147.1532390070592; Mon, 23 Jul 2018 16:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532390070; cv=none; d=google.com; s=arc-20160816; b=U8WUZJVuiJ4ElfFmk1NbuUoQNlLKFKZuA+tqwKJjAOMUHZ8Q8CgxosRCsVBfIMuzK+ xH/STvJni+DRcFT9GJZr9hd41U9AQJ2jSM0rpIcgY1woaSHv1K6ivrKh2EeQsyenndax HKVqA/Gw1yt9wY3aiaagH7R2UkbJ6oJ/kfNBcujzRXR4mb4V+mAhThz4cP/TeBPkdqxn ZE4C5j6rSeuRbK6udXyXOaicYu3Nd1uLzuF8eHSP+oFQgwrZEV4QOa9c7FRONLJLEAUy qBn6SPaAkzqa41HbFmDVPjvzqCEAJBt2HiO2ra1HlVAZ2XZcWRXqsthT5wr9CiSJSlPS /qHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=MIHWws+yVwognQ9cgbh9eiHrpkBERCetJAk6LhDuEcY=; b=a679Wg7swhhAajS9lWjwKvhvEGnnjO1nyygzSQO/nFq1UgRdo4AaOULG+f8nk+Yh1Q K9NxyY2ZXgevQSito1gbNMzlvdTrg6X3mbI1IlrswXa/gZ6zzPwxd7wpohc09SKh+sdF rUEjn9sEW6doA40un+df1+F4Tj/6MiQrpFIS4fsChgv1JUmAAd2efguT+pdtr8Pk6C3U Z5KdxEeY6KVphOoHYRPwfZsfV9UY6SRCIZE9GClIvlKUJa3ouJTsKcXr+IUouA//pBCH iX0KiZhYkCNBaHIqUir448ktOBkO08LS0Ww7X8GSZL0TGRmxHfwT+rixF7/8sCRlsT3g OCAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hQbmvTdt; 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 p5-v6si9460009wrn.104.2018.07.23.16.54.29; Mon, 23 Jul 2018 16:54:30 -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=hQbmvTdt; 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 034B1689E49; Tue, 24 Jul 2018 02:54:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EC54689E49 for ; Tue, 24 Jul 2018 02:54:07 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id 26-v6so1575165qks.9 for ; Mon, 23 Jul 2018 16:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fgjCcdTfc8Myc37QHJ0GlVndc3biSUCq1UYwZtAfVyU=; b=hQbmvTdtJzca/+bgSw/EfxO0DMWVsTZXu8/7/lfkB73LBRkDd+BBSd/BACembv1+b2 yWDwOI2B1VJA/Ofi2A7fZHos0XGcBR199uJ72sqfuCqAAdWV0Tq1cy2wc/udJfyAMuni KfZ0deMCQhTOwJ3YGuHMtj0olVVF4XGU21kO7RkW172zx5GmLnQvDlThc0vQj7/OGwxv FsMJQj3Og3XnEJK87NAyZHaBnlZ42oErB0WUL5T1YowSCAb9+8ugQ57VBAgEMqo4V5hA nNYcL2mmnrwL73RJcr8vbT9n/NItQ1L674bfMip1Y8fof9IYkTZGQ5xPW9lDdMP0FN0m WrGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fgjCcdTfc8Myc37QHJ0GlVndc3biSUCq1UYwZtAfVyU=; b=Md/EUtDu8jGOJnqtrRcdFL871UNxIUnoIF+vzkw44NxmrU8G5VIGrcrWli8PS2jrIi un0N8v4NkqTR0FahFjuEE0sjaavJmz6D6Oq5BCe5WNyIOEfXZfnqOZga+5R45bqscbtm JFW6ciAg9B4GJ5NNOgJh3sWpwNAEiFBQby/xz815IZuKNOmIQ8YIcUMXUTCTEOP8Mre+ 883C8pGd1IbebRY7AHu4+HpzgzNPOZ9dsFfQVV7mifU9epH5Al1JYX0Ks8QO/YPKK3B6 U3IUkCsSohxdaojBOlMhVeMJtUrkJkIwxssIrJaxaRae9fB1VdfhLlyh3wID55xcGRLC MYSA== X-Gm-Message-State: AOUpUlFnLxS7wbqEZQFsAX7qqkkEp0h6UvlCTpQM3gn7mpyyntZq40JJ IkySNoiWn/kmMomtoRhQWK4lwL7x X-Received: by 2002:a37:4653:: with SMTP id t80-v6mr13024409qka.314.1532389703053; Mon, 23 Jul 2018 16:48:23 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id q195-v6sm6662338qke.13.2018.07.23.16.48.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 16:48:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jul 2018 20:47:44 -0300 Message-Id: <20180723234744.11228-1-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_d3d11va: fix type arguments passed to IDXGIAdapter2_GetDesc() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" libavutil/hwcontext_d3d11va.c: In function 'd3d11va_device_create': libavutil/hwcontext_d3d11va.c:554:46: warning: passing argument 2 of 'pAdapter->lpVtbl->GetDesc' from incompatible pointer type [-Wincompatible-pointer-types] hr = IDXGIAdapter2_GetDesc(pAdapter, &desc); ^ libavutil/hwcontext_d3d11va.c:554:46: note: expected 'DXGI_ADAPTER_DESC * {aka struct DXGI_ADAPTER_DESC *}' but argument is of type 'DXGI_ADAPTER_DESC2 * {aka struct DXGI_ADAPTER_DESC2 *}' Signed-off-by: James Almer --- libavutil/hwcontext_d3d11va.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index b68d262804..41330f0ae6 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -550,7 +550,7 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, } if (pAdapter) { - DXGI_ADAPTER_DESC2 desc; + DXGI_ADAPTER_DESC desc; hr = IDXGIAdapter2_GetDesc(pAdapter, &desc); if (!FAILED(hr)) { av_log(ctx, AV_LOG_INFO, "Using device %04x:%04x (%ls).\n",