From patchwork Wed Jul 6 19:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 36693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp4413542pzh; Wed, 6 Jul 2022 12:50:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vyfoBsYsUBgxtF6s8Pl379qee6Skw20B9ck+gMC5Q99ACI0JD9Nu2EfZOuzNQz41jUQIQ5 X-Received: by 2002:a17:907:1c8a:b0:6e9:2a0d:d7b7 with SMTP id nb10-20020a1709071c8a00b006e92a0dd7b7mr38824132ejc.572.1657137033465; Wed, 06 Jul 2022 12:50:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657137033; cv=none; d=google.com; s=arc-20160816; b=V6d/PRK5LM9CBiqO8wH2IshtQMBL/bHPvsDJwrsJV7ebYFYLfLu86S+z7Cv2mCmmm4 1x7jYBmwtLy6HTW0z0TfTAHFuPwhjtxykfDs9ilRJ4K/BQDVah5wynZJPjAuHQr9bWNc WM6mJQ7C4rcddpLjtr4TzUQoXz/7j3YeeHVCf+YyN0q8eDZz985K5BVidB/IVV9Fxpd3 Bqfpf5wnkzKswYxNRe88N4S4K2O5cPzINnKEGUS7uesnvfZdX+C1OG8KqxgdEptqiiI2 O4f9IKJFvZGobqQbUwEax3Ql6f8ZLEJ3rUToiwSwJbUybrDKz082t4IA9oi0H8VYLnj7 JIoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=K6szcJ4z/CJwzAjELsv0RWCQ2HprBdjXjbB3jvdFaL0=; b=nwYbPh4/hy4fNSyOtIqPIo4SNZYcpwtmXTVaPsGnMMuF/vKhZK11gsobRe6++sw/A9 CGdsZT5yMuT4eamIQOYoj0IThPnNNGx51tbUZ+p+7Kh+d0KqiRHekWor0t2Z7f23qNbv i2wcJZtKIgGg4Z9oZug2bY0sCROfb3itep4s65aJTx0ah30JtJvFv2Whtb6iOkuBUhh6 IR4qWHsD+UPNAgwIQRyOOaxEsivlCqu82T1M9zYfIaWmsV0b8KKcqt50m0dj8BtWe51a zvIaXPzoAm99dZBqKLrMkgO2erDOVTgfi1u3Y+Pq5wmCmguWtj7Cq3sL+gytBSLDrMa9 juZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=W6LP4Idt; 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=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t15-20020a1709064f0f00b00726efd49e61si20305074eju.907.2022.07.06.12.50.31; Wed, 06 Jul 2022 12:50:33 -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=@rothenpieler.org header.s=mail header.b=W6LP4Idt; 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=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 676BD68BAB0; Wed, 6 Jul 2022 22:50:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91CE468BAA1 for ; Wed, 6 Jul 2022 22:50:20 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id AF58D34BDB7; Wed, 6 Jul 2022 21:50:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1657137019; bh=gcHFgghrJABVFrLkM8LdT5JZNUA+wwQnXwdD46jDp44=; h=From:To:Cc:Subject:Date; b=W6LP4Idtlfbr5GmeIn5PpzU7yuj5baUEc4ym48nTtCrsZzFVXr6Jgyknu4XpiGbqT MRhoiu8NrwmJAxFxY8IT7Asc1mi9w0w5COHGkVmtfI0m2isTzBx1BzEL3vnLMAglcr H727bulGf4YLfmFTAtJdLiAOGYpcpw/Tp6o6/dQ4PcyF3vjl54TKEKXZmv+4A3lqak HTuQ+0kOVQFOfXkU9MclnGy4maDbK4pL526e1krjPnoCiBXAWWTn0AmpwXbQCjYQ1D CWHPMSv2pnXn7RujNNmj402K0JqfD+CeGuTygCHrwkVznXPrPuYMgA5bs2+gq4JZB8 gjrQrHuX7x0PA== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jul 2022 21:50:02 +0200 Message-Id: <20220706195003.16703-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/hwcontext_d3d11va: fix mixed declaration and code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SuGx2yyt2muW --- libavutil/hwcontext_d3d11va.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 904d14bbc8..e5afcb2a9d 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -397,6 +397,7 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, D3D11_TEXTURE2D_DESC desc; D3D11_MAPPED_SUBRESOURCE map; HRESULT hr; + int res; if (frame->hw_frames_ctx->data != (uint8_t *)ctx || other->format != ctx->sw_format) return AVERROR(EINVAL); @@ -405,7 +406,7 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, if (!s->staging_texture) { ID3D11Texture2D_GetDesc((ID3D11Texture2D *)texture, &desc); - int res = d3d11va_create_staging_texture(ctx, desc.Format); + res = d3d11va_create_staging_texture(ctx, desc.Format); if (res < 0) return res; }