From patchwork Sun Mar 24 20:30:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp840061pzb; Sun, 24 Mar 2024 13:31:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRj+eDliw+9UTPZLmCwhfPizTraTgm+0Ln4q7paBQYl0oR9fbgDiq8bJWaGEqzYAJ7bHnGiPl55W0ayCYQwMzoyxFDQFMO/fM4Ww== X-Google-Smtp-Source: AGHT+IEPIm4pCCWE+sPKCFxGOtvfHn7DNOsYh+29oxtVPLt1PNaNGqUmECdNMzkJweMGVt6Fi5g9 X-Received: by 2002:a17:906:2742:b0:a47:817:5225 with SMTP id a2-20020a170906274200b00a4708175225mr4049876ejd.39.1711312270714; Sun, 24 Mar 2024 13:31:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qa43-20020a17090786ab00b00a473f5af3b9si1852306ejc.49.2024.03.24.13.31.10; Sun, 24 Mar 2024 13:31:10 -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=@outlook.com header.s=selector1 header.b=kMtQZ16R; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5DF68D1A1; Sun, 24 Mar 2024 22:31:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2090.outbound.protection.outlook.com [40.92.90.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5339168D24D for ; Sun, 24 Mar 2024 22:31:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RIFms1qdqbHYVHIoA8mjjsRbTdc8Kpt3t+DcdgsNR+ruFBsavW4BssLPjKaBxRjK8MQIdeqa/4/+oBZMrqtWfnDEWz5XLQYzFJIcN0mDzjotiSmYAsY26R7jQKJcT4U5+2vWar6zD2NhMnnnADeluxoDeoFwQkQVjZwGbwJTbrEelgRziYQj1iTAgea70q1uiIa8kaSFceto9Sm0z+3opLJIg0kJsT12RPQbyCAiI6XAKpvf2XhrUavPteQUyLQN6p95FEbU+E9LwE2Os3o0+lkE7+ynZZjqU+/7WBT9SFQND65SQLyOsS4tqxqi9CRWQJ1MPOwAjjTdgv6y/n50hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JbTb0whKQIRtoFdEOwWWVQASYnYG//YTZSxIZGyqdlc=; b=SRncCZ2ZX6A3Bvyi6GVFRdpaGqhoEB+dzpXZTjmATVVAZAnFX7aGdAz9xFILSTM2oq18KA0PGhhDd6kScTZ+2hJmOUxPNV5EK34bT+vBzXYohb8L4I6IT4NipYo2DPqc6XebStbnIvdexgpyagebSYwGXCD5Kut8mjKOt+3agUXDLu2CPLEyDkyJbwHfroZ0kGPvzklAgjwEv45nGQPMl40TqFTKrm3gBU9Tec/S2voZ12Xip/6Y8DlBUkjoAcj7PzAF1rhUKi0PG1XYuTx/OutR80hW69C9aq8Zq66cJpo6nabL/70uvljZQKCztyFVWznfpn+Qa44t0N/4fD4Dqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JbTb0whKQIRtoFdEOwWWVQASYnYG//YTZSxIZGyqdlc=; b=kMtQZ16R2Bl5axa35lHdaSzn+f/ZCFsGq08nazHDmVAFHL3M5IGro7ve7n3In8gBlroy+1Pycqiw9PTki2PFH11pKu8gxyLEeFO1PnXhyMglj8nlevC7pudhck601q4muRnZC6FxjmEDq+Ws6B8+dRM96dr2iOjaXUXqupkcWF8E/FzZ6ZlsUGnlBmyAjf5+oUD7N2dzL9hkeygvOQ2N3sga4OJR5zhdXlZmxFlNmRCyB00gBFi1sZ0v3losRh35uj5wbB0KnCPZRDWU+OvB0+zEkPfjQN9Ym/KAcCXhPBg7uCsxGyLCawVPYnEEt6W3sep5MgRUB9+8P9Aqzak18A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Sun, 24 Mar 2024 20:30:58 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Sun, 24 Mar 2024 20:30:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Mar 2024 21:30:49 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [QfgArjoqI8Vcn+ENNgV5V6GXrj2+XKMFKEM9ImF9Mf4=] X-ClientProxiedBy: ZR0P278CA0049.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240324203049.1888297-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0033:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bda4102-0a4f-4f51-e712-08dc4c415043 X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO8nEvIMEUDP6I+v1XzAyT3iTZuIW2+77kOlAX6w43Atoqm2ixQzt0SivYvC8eaPCfo68QfYREU5m3MA5YMTaydFPn/RTLxSuByH5QPNjOJWk0nU/1yfPbE/9Oe+37zQ7YnX41kcvcCC5oSyCoIsUXGvL0Wd5djQiAB89PtwrB8BoQfb7cOchzGq9XM26AaqUF5hITr27eZLIIDOosfbt39UyHOWHTlzWL4de6MFFdbneciT8dgtJzfP5tbzSCcB1rz2xx2bV5jZwmQ0/32ekvDlxh6AgI7v46zzUiCpWGxtxPXLH1MZ58RSuQcxcHLAO4bgfHUW+lnwbjJTRPJ6NdN7CR8voQP4gVY+mLOSLhW5e0eCgJhU9sYsVb16m5TnR2x1Mz04BWVrOLXsHDSxV9VT/f6dsp0D6wDFbEaakHWhU7R1PJaUyZRL6s8u1FHbr2M274Q0E+J3UeFuTcCJ6YxncL5rAJxl6k9FgBFhkiEiBC+7tzHaey/3fxP77lpT9d5TdHGHHqa1Pu56TSdyo3+gmKI2YcWg3ZeTXo/S1BLMuJCJqfjPzO+azw7IVjW0/OmqzPnAZrtZklO0hEAOJEmLDENsjmNcvWHIh1sTuf3jpQl+G9YKgZ+beNavW1z7K47tDh95WD/JTNbIqSsZiPiPb8BZSrJHVC/mpnPuPHtZV6EZZ9Fa9OIaeXRcugkNFbqwQO29gYtG3A== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xUAPPrMybFl6iV6J7LWpxv1dLVS/e/qRS1lH4rJncP3wV+9m5D/T8N4MoRjEAdn0fA3gNXA293EA3r5h0c7sB2oMVCQ8jjmrKhY3maHSFn4oy9EQ5OIm6FlTlVD9xRqoJOD5brVYJgnGLDo9Am5ecqSvMMt4xr4AO/8DcN1mM5Rhh0vLBs5glTpafNpPmMdA9RYqyBXiBVwes3IqcpGM+i3Y6yzEZKCJxNugjx/lJ1+JzpCC9ckUXQp6mX3j5jRoQFtgLz65IMy315a/B7W+CfmchhPIBx9HOddz7SnZx3DXdYPFqnbyEAWzTlF3SSLMuk8YtJZvOjwi+tl6pkDWxbHrkG3ikzFWpiAI2Omss5OS9Sl7lZPRwTFY413plLs2Lkb8QRCx22gW4D7NXX6UTVo0pgyxktFw4Z+3CsnmPiqqdb0y+9uoQPoU2PitnqvD42TneJlOdyoALPXVbFSmBvtkFPtHUlc7Uzi+fwBQ2MLs9qTtJprDAeIpehsQ93bhYHEnSQN+FWVoGUeRKSaXP5WY8n0kL+XvpZYqY6xKFCaHG82Pqz5L964smw4WFzYUJ92qxLJDg3RxNKejJlhMG0p64ZdmwRVO0TWy3xL3Ol7a2BUsw5qXQLj9q4Pv/GFz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZYF9u6Wezp1zVCRGe3wheDvY8WwLoxbrrObS3Zxn7b4YtGKR66qKrBVVyT+526zWmviBuc448I1QJe57TPvCR4dhUh1gwFI4tfMSD0FdA7uJd6ziHQ5VeRZeZYMfat8AvH4Z11Rq/iMtFBCSm0YY0QGiDA/d56uBPlnIo3yYRsn8jBWASTALK+X39ssVKCODqdGDGNyTQuDEbLIF7vELtSJnwAe2j7xWZomSmKZByfnuI9csvFqKo4kCpatpOLLSGhaVqMGzc0D7XC50sqxvZXMKbQV6UwUS7QqBh8psjcY4xLa4/bruS2jWCxAqPQl5rk+KO1QeJ6ZZ9SGSVWYn2PMIwhsaAQ/SNmBfVVv9YA6tJ229R51UxvbVgvKBRAZsszYL6Q01TdKmyUYux4WYTGNtsdJ6QXG8erfr6fvXHtbrlMz/5Unatf3P0cXobXUJpwu2Yz7ZUXgPunQcoDHC3e6dg6hvqsSamPRMHQv2TtXp0GXYFtBw8sCszR1LYBDqvmZbbGoH5jUg9VF0ZKjIKOnjhABZ6wrH8vXjuf0T4vobIwt42Dd4hSXHb/vYM/rq392wZ0FWSXtw4hUtRZ9fEZ2i/LoD791/E3P8cnTwkFhXITU0e/i2nMEUqI9KxhKGGyD7652rT87S5tX9/yQlCIk97kQZbed8cXVhvNU7iG5M9QrusGtCLr4Bui9jivEFfs+s9sCSxKBupXsxNVHVzOeiIiwFOlKRKy/Ai9e3PjdH5oPZa1AM9rgKZMYMXbnX5a7GJnBo8+JCPaZ8ZUggy78qMMehYHbvqJXH/p7YpigWuzli0menhO7VbzNH4zIQrKoCToW5DTthCRrSYsgcEcZ6qMuWEGzEQwQBnOkK6ElY+zmSrSIntRPXekvaKaTiXecNzOdNvMRO5d5hNq+v03XNMIwp09oaaBAOl+FFWEdhM6w5VIj0TefGm6IeGna28wK+WoOjGJIFepiS9ZDoS5q+OFSvwEm1kVWECh0sdtUkcvkaswIvLYpGCClMGfjHF4N3aRavEP++LbLNhz49ZGtMJACyuaAtqkqLhsMnlGtbgbOtIt39hGlm7QkON0oZUJ4Kax7cwUOrGYR2FXagPKvwbQMtBMrHSBxzkK93EGqPXCLsyV0AobBlYiS5/BTrjn5nevBtrhogdDd7/LWtRF2c7f3zNU4t6L9PhYJ/AKyEkjFef6YABuOzEKFkQagp+PE+zdIbO6mmR+r6bYhV5f28fjqCP4iJk4MGL54QdoW56bIskDEmPbciQ5G9YIiY+wGjClH65D6exoTAYAd1fw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bda4102-0a4f-4f51-e712-08dc4c415043 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2024 20:30:58.5872 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0033 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_qsv: 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EOjWQvRrFKaC Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index e5e043d2d1..c7c7878644 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1121,7 +1121,8 @@ fail: static int qsv_init_internal_session(AVHWFramesContext *ctx, mfxSession *session, int upload) { - AVQSVFramesContext *frames_hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *frames_hwctx = &s->p; QSVDeviceContext *device_priv = ctx->device_ctx->hwctx; AVQSVDeviceContext *hwctx = &device_priv->p; int opaque = 0; @@ -1153,7 +1154,6 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, } #if QSV_HAVE_OPAQUE - QSVFramesContext *s = ctx->hwctx; opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME); #endif