From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D9BAB49B51 for ; Sun, 3 Mar 2024 18:41:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0D5E68D3C9; Sun, 3 Mar 2024 20:41:17 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2069.outbound.protection.outlook.com [40.92.74.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A70B368D3BA for ; Sun, 3 Mar 2024 20:41:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oNLG5TYNSewdiRxffbICIEJYxe2Y4vhgJDhjeEoteGWXBEpAv5Ombz/wZkPLzi5EfJwnVLeL7qwbQBOtKIoapT3UpsK/X9bNvfMrfjqcxYdCDmprAvwq/MhvMq+eUaxCbNH0U/q/VQkDOjN1IaSuGzH0ZlqMZvPh2VfuJCpZ3VPGdp+fkcGIyuPYRL94DzOfWJG/VGeo759wodUpaF4u+e0fJFyB0ubw5yTGg+ocrNpf74rdxa8jLYlQXrkzXdgKk3I2LEwclNyIfxDoVrSKUlh4zT4b8LigNIWNaZ1oF8tzWMax51iU9+HJsb7QCi9+glcMGXKvY2/DP9hFRH4jPQ== 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=qOHe6qM9EXrps58MvYRas/3MiHbX0dOO7oFSp9+LRbg=; b=J3ZzoGiqTZ6pdYOjAyPuCKTn2J1HCyXiXCpK9jTS/YtuogHT4eUzCegLe3OEaJB5Wvc6jPI1cXyQSdP2ncSCTT+ssH5PHXLKutbBaJ0F+3oUxoV1nxtgIh20C4OtUf9syfmTTwvfp5D0++P+Atd2+NHs3Rud0WxsJyVCCk3kgeybcpzpz9dsQw6BtzRAgz9y9ri1ZHmaJPd2H/HRnwjPV+UL7d95Sad83PEZYvGujHiE2oINKhJ8zKN170wHna1hFimIppD3Iy8dxfMycFxV8No5oyvfxBRxF5F0VuEYnDTe2j+cDIou+YcLYqU3/nMaGwQXqj+ZwmhAf8Te9xYI2Q== 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=qOHe6qM9EXrps58MvYRas/3MiHbX0dOO7oFSp9+LRbg=; b=gcYiGgOAaBQNJeCGAt92nuD09bh41/LIJMdK6Gpn6dI82covh59XUcuhLZeffjkvWtjSN/0VPoF5KfB5MgPMHRms7o3IMEL0i7oA5yaJoqey7PymsA1L1iDYIoBPnQhnUQUR5BH89770R9DGmSB3i6jgVeBAtc7OgVIXwG+A2Y4B8/b7LRbtWCZz072z/Pbyc3TaCz7bSpeR86gVef2V/7a6jcX4Fx5sZUsbTGZ3xYBgh6yqDvkxFUe+A7HndWNlIqRPTyTH5gPjJ3Hen8Lxkg+ImAB6uuWgVKsGhJBlX9WSRLtf2rqtehCQKdIXGrP9Tw/pkor47AEMSP3qlAF3jQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0538.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:295::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Sun, 3 Mar 2024 18:41:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sun, 3 Mar 2024 18:41:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 19:42:47 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [+I42Cs2U9wf+QOrEccTdnnAWcn3Y5IojOU6IK1BHI00=] X-ClientProxiedBy: ZR2P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240303184250.541590-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0538:EE_ X-MS-Office365-Filtering-Correlation-Id: 2524561d-41db-4a66-8a48-08dc3bb17c36 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBNlqXpgndjr4h+wQt1UEYh3aBYgyaNCwYM216tJJ0TFzEjOfstSFXWCzTfPzqmhyIl7zqsWBD/BtVOhCMKf6aqOhzTl43v2AcE34wEZN1iiRZhW3mSj+4+cU4zQaIw+x6y0xtFM3OQOcAHqxy6JET1s3/y0p6LpqcLuvReUq2LJggJPouBB/pso5sDP/qXDgKH4FoULGwb+R06he0DKrwmuP5sH0U7V2zmalmiFReGa/593TPmpPA70F8mzLselaDXJTIO26D8lY26FqipbVSqRd8j5mcMqND6/f64Ut9DzkQBNjuvIEG4+tLDnN/ViDSRh5cU9nEjR/5LqInMy5M6EsyMI2ERY7TFzpdwBvwcQcVGC320toQLTK2Piiu692KlwK16S2VX8PFAO5HYnC2OhvKzEDAOtA+yjXaMsv2degXJh6rLap8IVdP6R/SOqAwXBnpC1ThQIwkDYERK6gFyfSpRlDEU2ceAXrqTMbnKcY6F+5qOgYlbZ0lGL5aihnFsdfqpcnq3KXexbAj7BlXK/boQrpnefBXd59YBDybV0OHG2svwQO1pKVrGX+A49jsKjQ6Mj+y+KzEyM3s+3qF6Iz2GIjtlSbpjsm3w67ax3dmk9qvvoHcPikQ5/KCvIzOCq7RMT3pjgHintD6P140P205sA8tXBT1owQr0uQi7tJxhbVvw1JyRSq0HeMjInbIAJNxy7rzZUi/E7BNLrPgCCcUgkM34cv2qy8mGqvXtyw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NrpPi69WTRBJ9voR96H5RlumdoW5rery+ZvK0scfmcVa51WpZIAIo0GFfxA4MkvhLOnra6vaorxvGzvYnHrtKBUUAcgzRuFHmiqaRgtwPx6Fi4fW1KY8D9aPcnBoaRHrnkuJVc5M23M/dlh+rAzl6aJufmsLzaPR5AZAzU8S9r2+nJ8hXiHzB8WOs3ege1aLUg2/ANHTzTn8vnpcAwzZouvc0MChQ4/fLn9B2zn0yKv1XHkZUhHtD9cBx2Ziwt0b34ejtt+hUYVpWuPVj1ZCtd5HUe61HajWAgzoECobbHXHB7OhR5YsIl438QowJ/6QxNIUJnc8wKZYLc8fEGHsl1g+v7Ty3E//fKOWwbddAbG17C2OfHwfJYp9f6PWe1DXIPniqH+MxuEsDqz+KbXB6+2c08lxFas8eez/QZuFuFwy70p8rgIpOXbFIv1LW9lbwyQI9RvnjaMwS/TD/dO7VzkozQw70TXhvXYHTkktU0V8OpX5CNiMxzyfhCdNTYbY99mJK039heOXV1uA1UwxZACiAJ1U1qsn/6LOnxl3dOP/n2GRauHMpgwz76zBmf2FsOTW2I5uyNHeIfw6ubsG3XncoxajEgzujdfONTady27gVcnG9Z+AJxxl58UM8aVQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5oZIHHoVDRbZ9w7+ZpgdJQ2jIor+hVX9LnAgwJ4DXwjZ/O0diYuCpJCnKR62?= =?us-ascii?Q?bCdC0DkQ/cjQJa1i4Ba5z5Txvl6hZ168rx9xmNwwUhqfLoagHOiiF5TrUXGj?= =?us-ascii?Q?U2/RcYKcqwWc5R2RfnWTG5i12PcFBMm8aYn3YVoyvf3Dopg/TvvpvRqudXBl?= =?us-ascii?Q?0p8L5FWav4Ayybi057XXOM3WOql3WTTNQyoWU2voZZNSXO7lQXCB1JHeSEQ6?= =?us-ascii?Q?x4UzH3QdmYTXHO9UeOJVw+UCYZqUyaPlHE0te9/g95EJvcJ+WtswY6KZZ5Nt?= =?us-ascii?Q?pP7QYWh/sLoReQ7cZWgGQShfDDeLrR/2xFl7aFRiviNWF+SCqGIyfCDV27eI?= =?us-ascii?Q?YzJGFm9Xr7+t/ShECcfJKh5dYbqLxDgHGIale9ogvLQNWlA9vBqInq98J4yL?= =?us-ascii?Q?nogC93znTEc4cZdFPfWhdT+l6ricOU9xLz2nlXrc7rSHr7JQ5tmF7p/goGrz?= =?us-ascii?Q?yyUkxCqE+RgsW/8k4PA09MXOmaxGHsBMgeg6bx8yHUyK6nggbMGn/9m+QDgA?= =?us-ascii?Q?9uux1Vvv4uuOSpWXDtiCgxlqea/qwjsa1sQD4XWIu8sc3OJAGq3ORg6QAL5i?= =?us-ascii?Q?pl6nIYujF2tUMv+CloWzyhQNyPxT05LMXsZrhYAC7UTNdFqIF1FWm6msAAIw?= =?us-ascii?Q?YQ8KOI+PPfMvvJeyor45UhiSBHP64GTsI+GtvdwRpJYcdMYYeY2lJYfIxywr?= =?us-ascii?Q?dMfcGwLbm9X2VWdc9E84Y6Lk5mX+vgz1vG+xNAlZUvbVfFl0zagwURq2CEiS?= =?us-ascii?Q?ShwFkgS9tn6v9DhR4InXJIL0r44iLh3aaYCH41xIqoez636QXii+QZTPgWu+?= =?us-ascii?Q?YDxI1spdss0hH7ygC6MIhmSAjkDHXG81OKFIGOdRiTS08KCOjLI36dJm7ygM?= =?us-ascii?Q?I15i3HU5mnlLnTgnTgHHK8k/LhBQGqR6dt39U2lJtPTg4V/7Y/Oh8lhQXLid?= =?us-ascii?Q?oOlUrA7gEQJNoXRwIbRLyf5EST140KylhtFTdsTqfZy2kEviulD+gZAp1wMd?= =?us-ascii?Q?wb8fdVsQyMKeiE+O4Sc/4c6gsQ2+4SScOAg0BoT6MXanTQNX7AryxF7aKJJx?= =?us-ascii?Q?ZiiDJNTJhaIe2bPJ/VxlL7f9wCo2G5l2B9SnlI1WdSbYvIgCvR3tLHLOaHWc?= =?us-ascii?Q?Pxmv7bEsPJHtR69O48ACZMzLz//lmc/Ul+Zr+HLHNLCoBXOs4w4aVevpdqmL?= =?us-ascii?Q?Mfg1oZyNl9M89jXI6gLNaYij400+0t6YT08NFt4xz3ug/3Dw06iuKTupO0JI?= =?us-ascii?Q?4eEcYlEjoFrPOlrNHGELDKsbrcO0ScH98jC4VRxM2A=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2524561d-41db-4a66-8a48-08dc3bb17c36 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2024 18:41:06.1032 (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: PRAP250MB0538 Subject: [FFmpeg-devel] [PATCH 5/8] avutil/vulkan: Avoid shadowing 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavutil/vulkan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 76b61dcaaa..4392a77d6c 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1308,13 +1308,15 @@ void ff_vk_frame_barrier(FFVulkanContext *s, FFVkExecContext *e, VkImageLayout new_layout, uint32_t new_qf) { - int i, found; + int found = -1; AVVkFrame *vkf = (AVVkFrame *)pic->data[0]; const int nb_images = ff_vk_count_images(vkf); - for (i = 0; i < e->nb_frame_deps; i++) - if (e->frame_deps[i]->data[0] == pic->data[0]) + for (int i = 0; i < e->nb_frame_deps; i++) + if (e->frame_deps[i]->data[0] == pic->data[0]) { + if (e->frame_update[i]) + found = i; break; - found = (i < e->nb_frame_deps) && (e->frame_update[i]) ? i : -1; + } for (int i = 0; i < nb_images; i++) { bar[*nb_bar] = (VkImageMemoryBarrier2) { -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".