From patchwork Sun Mar 12 21:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40653 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1266698pzb; Sun, 12 Mar 2023 14:52:32 -0700 (PDT) X-Google-Smtp-Source: AK7set9KM5ZGoJb/Bb8Vepe5fqFrR9R5DA/W4hqEnE79c4rjzNtKFNqiOzRt0DT61eGj16UI6Lrs X-Received: by 2002:a17:906:22c8:b0:8e6:1726:df82 with SMTP id q8-20020a17090622c800b008e61726df82mr8740780eja.30.1678657952139; Sun, 12 Mar 2023 14:52:32 -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 x24-20020a1709064a9800b008b177104a57si5460801eju.344.2023.03.12.14.52.31; Sun, 12 Mar 2023 14:52:32 -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=A5cUuJu8; 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 88BD268BA7F; Sun, 12 Mar 2023 23:52:29 +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-vi1eur05olkn2065.outbound.protection.outlook.com [40.92.90.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9CE4689C14 for ; Sun, 12 Mar 2023 23:52:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KkbNA+vYxAH/XB24a4qMkgP7WBlB8tWMiVQGUwFrqU9le/rD6ryRv/CmMWcLxE0+dCSDmpbI+7vxTr48c4UwnxitYPTrPIxRSAWbJR4Ro74+F048qy8wh12PbwJTa2QMJwDLmMOa9AiWCBv9TcYDPT5kjZGPDlts+QaRHhWNtKagacMxetkP53vEX2fZ3A4zMHH8Dterz6to+z3XPBLT514kXC1ACNBzb8cUBGn8TMuonQ9SSe9VFYEmXCBJU/s1tPA+BotrPrGaRaHD/XlVlCrOZVulAYNM6nGWm+BbKvoKnGch8okMTB/poPCvtXV5rE89gJhReCRXfzb+vQF/bg== 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=uKVCx2hUY9LbFo71hRrubqilE693EUC3iWeqDF/Uesk=; b=mD6PkW/HLzqrRFQzm5nUt6H2/zPEJ6iB51+r0G/7LwQOKeicx/OZDaKWT9Ho3l52CEzR628E4lqz5+ZI1s/4gwhAjePOyhgdaGW3fd5D2TCrbD5ElXNW+NUqIxr1wzHmIm40XNWGfyZoNOi48h5sU6q3DefRn8bFigCnJAUW8hhZ418LRq11nS608MqZxzbtBe3rTIQsz829jTrYBCibGOJy6VS32J0aBkoKW7rTKrB3SeamZ+WOHIW7CHtojM6uFS106UGW6bzl0j8pQQc/obgsdRqZHHuyn+QYKUl1JSiuh/C/RlWoqYHS/PAHWaVvdBpZrAkUM8yETmUjs6wf2g== 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=uKVCx2hUY9LbFo71hRrubqilE693EUC3iWeqDF/Uesk=; b=A5cUuJu85ea5B6DxWXAD/YWyBNir4qZH5V9zZgBRG9585sPR0IXAqRzKULwLo2TxvLbNVS7AIqWIrCjIs/Pdw+XjdaaG0fQS51nC245FtPY16M+uzMB7wesmsexhAMloGGT7QS1tUayLnozr0jqWRzrU1FsCvVDGaFGSffmlUXHeUHK6t7jMMD9t5joDP18kGe26nIIu9s9xNTbWXC+QN3xCoGyQ9GB/Hsd0P18Mjg42RaKZHZ8ZMrHr03ZhkZ8HlmtLU4x1/z1NeKpCvrdi80QuFRUdBZ4ZnJ58Lwu7dMKl85h/sN8ULiyE7ltV4FIga8AJdJl+GFjs1AoBM7PGoA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV1P250MB0907.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 21:52:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 21:52:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 22:52:49 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [RJIT4rgGpodW4bS2N8YI4PmUbMQHOj1WzzFXRTijfxU=] X-ClientProxiedBy: ZR2P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312215251.454737-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV1P250MB0907:EE_ X-MS-Office365-Filtering-Correlation-Id: 51d883e6-af4d-4596-189e-08db23440e5c X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U+U1ZWuGeDU1Yi2gWVdh2PRlIE+WdMyBZdtg5geTbYAnTzn4Mn3C4MQZgujJ+RcpNeEjA1v5eaPXbNv+kyRXmusDZCv9o7MCHuc7CsAw9Al6ss6clI5GXiMvEQR1W24FFf4qku6ls5Zg9j8BapuBiIsz+EKQCEp6nRhsSl7f/TUk23R6sjYJPedbjvlx0+diR35SEdcIZeeJ4QkbkgQ4vTwBIvWYqJlcTvQz+xCJ6owvxWv7TUyTqRxOLvLxKX35tPpi91/fjUMkoE130R/Ra+d8ltTqBYGfq1CXg+X4RF2sSsdCgtRk3g8DzJYmBRu83E55RWZp1RwXdekP7xJwZt9rwYy3CGltZ+6jiMOkNvcDPU6AxoONNM2LO6AnlSPF1A1lK8Ivj7SDsx/1W71TvlCa/y8zDn50iOGB++lhd5Z//N//fQPsOnX0sJFKD6pC5e57EPL7Gpe+G8xst+SmJ/7IdKhv/alxkNTJ5Bun41YFDHglsBAjExYXiWyFdNSJbPh/zjj+6xx/osFo4JTKuejq84uGV8CDf4VqmszNmO3VBBDs87DXAU+MM0Wu/mW6rxvUpBeo7ClaOy+ObIRHSxeHRyw9hKzAvg46EWZ+PjhY7HxyByzceHg9IwEFfzPrCWaUJ9GdqdjlyV8iagE+eD4tsXGn7HcSMyo4fP/E7oJAXWCXPWSJcJVXt+q+YivfMW0ql0p2PhUannzUiY6z1kWBu/wCOYSZ4co8dUo5IxyaA/cS9XZlv4M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2NcyJW1N2zDRY1zY1LNgw4DBqU0lMGoYpnT29nApkFNp/iW7Uwy/XEqlOlsqXm86eBc3jFidRIIccxi2wS2C+3VZu65kokRbeKf9tELu0fdlTvU3iLkapjz02FK5it3IfCAAdbbpxWKTZQIludN/UteirXdT+pfC1fgOOz18+c0DgSWrw7K3zQQvkSwTK8q6h+e0/DTiCYmcKmrIwZXOxEMOjKu86jKDtLQqcKZ1XPTyACToOLvBHn40v1f8D/JvWIAjrALF2bqguBd6Jgrfv45u82pzfvXlcem9a05H2DsxcuSMgv+TdlLWyqAlMFwo97CdhmsOTB+Fu+Dzh+SIQrBjSaPxGlFblXANkX5/rlw3b75L7nEdii0oegA/WEgzff3CpgOHAqWvutFpX1bs1e5MG/CmNxCkaoo5aT0zkdE3eH7xdjJr/F2dwMJbfyV3/HXyEoiuLfSyNRAGqc31AXUeFXWXdXMm0EZn6iGDgSn6Hk9SbHbGTTrO321jlINOzVBGJQnLNA+a6AjM3RCKyqEFGIs4dx3dw7PpOHWEjpqUCePWTo7wsNxE7Y82mMhDIUSVEzFt4ShLIVg9AzIMyfCqLRyy6aHBKHBB0Z7nMc/YOx/kYkMDmh9Gzio7DUcaJJ6Z9pGR5/V0bYHJJPlfmIFuFxQDIDGMArXMG3dIAGo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i0sYzsecSmn71f78YM0mWPwIEn40mSW6ULxayUH+iXpocsDPhBkWgKpDE/nG/24+lKkTXlbtNhnQ+XZfgzF1B4hqVoBXq7iWlUYgU3sdsL6vaio4JhXpvv7p3hlF+58KF8tNXpvQX0LpQvUoUP1L1uIQtuf0GEYc8ePkxj1oDLYkNJdPd18afMjj3YqgOFiFsKXVf0CxI4zg90Gj1z/nNTH0xUbF4okO0VTEnGYcNArkVfRtk/ZbGKmSfpHktoJY3hte+SPZ4puSPcLnRu9StMh3ly0PNyTg9jUQLhQ9J/5q9lGSW7f6VcItJGSSqjJsGzPvMb8QM6JCjsJvqTRUu8WwVfcRAEGYlVbquWT03Sv/nfqzSKGeHmxT9gJTyC9o73Ar8SLee92vkqIumb1rok6AkKacRIlqTDyrPG5h8h0YdH+Le70E2/JzXeiYJuN5RyvXn5qsuO45n0Rp6o49UfiNHH+470tgcjTn89cuizFh96n7X3vVWw5lfmQUO5vKc+PWWpF1cpiNq3l1ZR1oZh0p518RFiqwGk/l73QYfPxeZmSJFlJ2Gc29ervRb48lt27L88O8h+YL7G7kiQMOrEQO1NjTTb8XFKC8GQ0TdlqTHsT5pJiVGCeNJgXA/0LIqWyz47Q4m+hDtcgkkVXY7CUdNNOFlvOLTDMo9HhHX1SA+CBpmQ1veOIz4cHR4yKwFA3rDrto+piDqMVtra4BIIm5wy2JFR7ngSdW35avstSAFAP5PKQANZmxucQ2+an681w9jNzVOpV3u12MsSJjI9e3BS4vYA7/51mcCu+G3OOxwHhN1Krx6oms1RuTRKrqOOiYqMEHFG6xMCUZloFS8h6LWqp3RxoH/aJRd2dXhdO0lqgg2PLJ4yHT5m/Y3S074WPQ6B9KuQgGaoJra+kyqD6NmDEI51/3bW5mBPonYmqQZ1KI9YsUnH+BGzdtFIet/Mx7I1QpPvphL6qnbUbOrZHs5/cD/cXEG64eQHAPrZVPFV6pw5AwNmQTxxlSgDxKbgpnysV8YngevrD8DsxD4R2PJXk2SBRns3fMVluvETp3WOVRWsqjI9mGNnMqZ1XqbGuDEBP2NtzY4iuTqw+xyOD9gm4qm5oEf2i9AX0988SkVen87bopNaLYM0s3NKHils3yAG+ibLjlBnlSV/pOsUQN8tijgcDz9eVtJhnOEKK6rlw8HC766AySxOsDdrOfFvkiDlyV1KlnIGjc+be8F2Kulop9qSu1A9L8eOlocW8V/qWlBbuxQWzmspCy1+bcmksyCQf+TViaLr0euH9SZkmb8PEWhSWJWG3++yLRo7HR+5rCZpyFJxH/ItAgynNh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51d883e6-af4d-4596-189e-08db23440e5c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 21:52:21.0909 (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: GV1P250MB0907 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_ssim360: Use correct type in sizeof 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: RBGvGLLnX735 SSIM360Context.ssim360_hist is an array of four pointers to double; so sizeof(*ssim360_hist[0]) (=sizeof(double)) is the correct size to use to calculate the amount of memory to allocate, not sizeof(*ssim360_hist) (which is sizeof(double*)). Use FF_ALLOCZ_TYPED_ARRAY to avoid this issue altogether. Fixes Coverity issue #1520671. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim360.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_ssim360.c b/libavfilter/vf_ssim360.c index 3eb8e43bbc..f8ce0744f2 100644 --- a/libavfilter/vf_ssim360.c +++ b/libavfilter/vf_ssim360.c @@ -1624,7 +1624,7 @@ static int config_output(AVFilterLink *outlink) memset(s->ssim360_percentile_sum, 0, sizeof(s->ssim360_percentile_sum)); for (int i = 0; i < s->nb_components; i++) { - s->ssim360_hist[i] = av_calloc(SSIM360_HIST_SIZE, sizeof(*s->ssim360_hist)); + FF_ALLOCZ_TYPED_ARRAY(s->ssim360_hist[i], SSIM360_HIST_SIZE); if (!s->ssim360_hist[i]) return AVERROR(ENOMEM); } From patchwork Sun Mar 12 21:53:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1266957pzb; Sun, 12 Mar 2023 14:53:25 -0700 (PDT) X-Google-Smtp-Source: AK7set++/oy43Y6Cihq34U6sJ5LkrZKUxVIaeY/bQxxUmvJzJMPJRQvFFw7qEdtyUZWz2BEDezW1 X-Received: by 2002:a17:906:1412:b0:8b1:7ac6:3186 with SMTP id p18-20020a170906141200b008b17ac63186mr32803456ejc.68.1678658005154; Sun, 12 Mar 2023 14:53:25 -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 gn5-20020a1709070d0500b008b981b82f65si2346837ejc.42.2023.03.12.14.53.24; Sun, 12 Mar 2023 14:53:25 -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=AlZQu1Ed; 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 B30C068BB83; Sun, 12 Mar 2023 23:53:22 +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-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C376688336 for ; Sun, 12 Mar 2023 23:53:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ux101+aVy5tSY5Dqq7OOkOo9sINsLYHmBQw1oTBRZ5uQfQ1Pf+6nQhiA+AXrzwXzw8nFFhAgXckVsIny4tGTohSm2HpRR4eSkeNYkMZAv+rHgrCMH7HnGbvVIq9IABjw+Oon5XNc9hUulfFSq6lAPizy6MX/a59PAxyJpHU69GnA0pN/meIXeiG05h9thZJgyTy6S5Z1o3mWazo3C+/cb2n0eTi2oT5dLLt5c4Kz3gI0Zt9K32JMcVjVvSViufvXfd80Ubb6S0QD2dec1YfT2NvhPGhD//AAoNX99AJXTDD/LeEBfdZseMGyQppA5tWx7V1snXTpWht/Up2CZCRooA== 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=MEiWjg4FrbL3i1E9ZyvKMhHCaE1Pe4k/cu1iFyALPpY=; b=cMu+rsQHBNiVUFZZ2tCiDSkov6cLu1qXTum7NsmGN08LSlIoEl617P7W9pz5kK2eq3CyQWGbOsm6ePYz1qjLjmQZKwi4uHOLQ0ZoGFAzKDX8GeUNtXfqdRHRZYSlipUTi3U+Ejl2tN25GvlJt9zDkMLomvI9mjy4mu/PGAqBOmOGq69SOsY0CvqnMKe57LlUubUJtLBbACRB/HJe7sZfh2NAR4byl7oFxHpqdnHj3UEi+ELhXzXl9+Ayv2ZHQnzPdDRJGaB+XKETCSUOUR6KXjfD0x5J7UePFRstOkmGrk5EnKy06UcQZyToGsi0vq4K3gwBzbjHKzcIrzgpyblURQ== 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=MEiWjg4FrbL3i1E9ZyvKMhHCaE1Pe4k/cu1iFyALPpY=; b=AlZQu1EdjW0SlZg9RCOUtsKoTIsPWEW8HsdSKyepFhXGhygqz31T0CoE5mHZwH+GrfUyBBYIB9+Q+Hkel3uYiGKnWyt5HpAWLHAn7Ms3c6UZb0N9I5db+Bh+iLgzi8PJjrHsloWwFfLPUlYif5DGI/hoQTRZm+UN34S/S2qAH5gpX0+5aZ6Kybx1uNCLQxMQ5NG0qqGZnd5Sv4aUt+wf+HJH0WQcDsnWfKKc+zZRe3ox1etZS2vVnjmbe6251Mick96OhGO9DTXzE6YXwxG31MY1oM5vo/VQRC8FkUDl8cmIYQut1KsOGXq8FKtqeC82SeBRfMySoIHTHs3SXIdbOw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV1P250MB0907.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 21:53:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 21:53:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 22:53:44 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [S9i4Y/H8UID+9VYPHNzO/MaKg2XQlCKzmlWrUGK4QAI=] X-ClientProxiedBy: ZR0P278CA0079.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312215345.468293-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV1P250MB0907:EE_ X-MS-Office365-Filtering-Correlation-Id: a15169d9-34bf-4f08-17fc-08db23442ea4 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U+U1ZWuGeDU1y8WwGGxvvPSVIajoZMHI9tBfOI/d8tmY4MBYcnPy7Sm6DjWoIGFGK0+k6CbAtPObe4m7IHFaSgYl9fOIDnsaPztNx7XrQ2kJsRkaxdY7cpQ4hBBvfvaIfIngmFnl4CWH3PfGJvdquZQCfc/C/UoX/ShW/G1x2atv6SRhMGldVVO5Scs2khiRUWddM7Bb8xXGXdOH77+HFkSg+A6EoWkD2y4OftluszplAIGkHb/jhdhWwHwHxzYO71UYnLt873CMqePIkCgVohwshJPoC19b1s0PdghzSnFUMcHt+xq8/Cyl652iDRZPlTvrQ3yU1v2Hy2jCMv02YgQSW9oIAaO5H+x2PPUPGV9+K9rtr9P3wvACKKBDhH/rh7Ne4vRgFkY8QFUfGv+iSLzwX3Y3xD/BdzVlCEM4Uq1JC/fuySFrENxSxo2S7tqINnTu4+0ryJIpHbq35GtSg6PkRlYQpBqlLpAAh80Pf0LY0N1i5zT7TtT/Lvsa5YtoenYucuqG0a5uZvjRi8QebnjlJkRapTDlnfzDvYhs/PfjHa0kueuthOx5P31nOgrVoViNKcOd5cHlzym/jZRhGhbELBBbI9tUWWwRhA0amOpdrj62b/JQ3E5UqusIr88mOThpqq+MapRflRvn21G4MwIPvJkD8EKERyHnL9MK56ZDAXZpxRr3iVcVnbXIpgYYlEdb+lN6BIrZn8oyB0wDTdQHG4Ju34F7S7CMJ+EGZnSp9ZqH5jxF66s= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hRdsj+8T8RyDjYxuyqbeiWntcIcu/gSNDkO50x36AQeXQsq0gz5KJuntyIZZKEN0cOo+KrOger4OiidFGdKqxzRPRu4lYlxNLCU2ZFHC9Jgs4LzVFdCsPrfjSIcnnqHGVV+7kPoaQsR4sTfrRzltYFNvCoT/7Ihmr+DW87B7FlO1ZfZDJ70GM5tW0n+lmuzHYWdWZJPDfHejkxK2Mfln/49+pdfDX1CArHqDyo3ZemJD705H9Gn7ZbmnfYBrphPSVoiaf0WkwIjKYNEQtyE9SRT0CfxRDjvzDfA18dldtRVRT69DE2nWijPl1X6kbCd4u+NhznFu6ENyUytJ8PvR4EeILF/6lwIVjbPILE6Nt5WR9OPTbez3g51tqbNhmit67TmnBEe0fthgRTHJQeeMszlzp+Aoq3i+WdhvzerG3dsre+MrZnbkrLRjpC8wVjgqd3iI9V25MeQtCIXOMYlVOYxrPexKSJF3R6htb/FhR+dmWinIvS/6vWDQDMYV1OyvU1j88XUY65TxpKmHQVhjUdSYjom6gCuLJrW/ExcbQ/3IUptbjgpDwPI5lRcjPy4Rv0PV24ykyx/632a+p0rtc6mr81iWYfnFzycvDC71GhmofLT0HaKOJhVlxFpOSCNvqi0akdsE6MCJAcvzw+Tyyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1o3dgno8V7eAl6kwg+MqQGog/56e8GQ3Xgkkoron5QnNxY+8Sk27PDEgo5zPNaHTirvKyN4ulYm28IiExM8NWXMb1WYHTCS8+hYZt4fit4bwkKfP8wM8omrTrRrPrz1Oh36oTFsluvN8UkMAkJpIllXeOY+rBSQMeQUMqVDWc4L440MrxCjn9ZhJPhlM2x0OkKhCvqw8AtdyPYcSQLJ4dNG3OEE9wNihNKfD1IZ4TDv7zHf94kA4tAqeuaZhwo6sJ/+oI329wemPTkb4unMt78CXQFcm2Okrld7OnSSjJ97fzvqFBV41XL0hFLkzokruiUhdbxs4HwSCXi+ei++YKOusycWHZ5NYO8Cqgk15EJuSn/NnuelWeq6wZky84UiMbYpJ+NNgUSf8kn/psJvrJDMMy9zrUUVnw4U2FfQ3vLeb+qInj1QZSEYYtfP66GOAdan7lIDLz7U0Oastuus68j0s/UaCpig6Z8yyZuAMYKEbbYSYuCfFWmzu5klP1/I65wrrRf8YKMO4+VGPq5EyExXNbbq4GHbAeTcrBrfAckmFx7/L4cKKWGfO25x9IrDFuodgMFQiZTmMwVKqSSC3zNC4PWlyLfS9CzgoLzrRhPaXlLqviVljx17wGZFABhqjdaTXe7IGE5kv/CTv1b+ln1W8MQ8kZg7ANXkrW9RTxC31RY7jYBvEhNxhzKEUGHIMPXBGH35/FzpIlwLKdFHBpm+yqocJeJ/d2Y9UmYWPJlk8lGuN+dmU7VwUDmIM26eNjNb+ziSPMTptNQq3/OYxqRBbcrXZEKKITHQMg3yc0VTq/t65gUz0oCHziNhEwO9MM3X/ukOkY6YZrB5wn8AhJ+ndBwnIN6zP4vbs9OsCLQrGcGRgIenNkKyxm+5pZP3mSpjyZgL8Eaut3eY/qjelot1p9CMYdJMhtG3YT6RT+pAc7XBCjFxpMTy5e2R/gUI8HI4AiurKbf7nCASRBusBzNOeZnkzRDtA5+YZjm0x0smKCT1GUPJa6XokfuC3Zi6IcZsIX3/cegTuRUNm+TckBTQR1SOOlOE9IgaRSWqRcivIfob9O1nGi3UIBwthGghWZuKpqvur6P2/mmBOzyCWW/eIVZQbtzWmUDSvtELildRIW9/HYV+2Isccr9jxt5xGf5pXkAP7tMRaGjqsjVneuyURIvcm9SUj9iHFviq1EAdUwTMM0TuRzkgZLw4BhmXzjuaCJUKwnopfw1Xsy57R+6/rWBS8sIdhcaI4N3IOkXTc3n+SBLgibX92amHULOL8UIbJwBMPW81d7pN4yKc/NWsuw+I2DJVM1M+ytvvCy20= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a15169d9-34bf-4f08-17fc-08db23442ea4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 21:53:15.2810 (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: GV1P250MB0907 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_ssim360: Remove dead 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: C4EM59g89IdA Fixes Coverity issue #1520669. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim360.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_ssim360.c b/libavfilter/vf_ssim360.c index f8ce0744f2..5794275c2c 100644 --- a/libavfilter/vf_ssim360.c +++ b/libavfilter/vf_ssim360.c @@ -1274,10 +1274,6 @@ static int parse_heatmaps(void *logctx, HeatmapList **proot, ret = AVERROR(ENOMEM); goto fail; } - if (!line) { - av_freep(&line); - break; - } // first value is frame id av_strtok(line, ",", &saveptr); From patchwork Sun Mar 12 21:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1267014pzb; Sun, 12 Mar 2023 14:53:33 -0700 (PDT) X-Google-Smtp-Source: AK7set8GRjMN0br9SAaVpOD9674VQHAqHck1ESFFlut0D8EBtg8A+JyAorYVwPnABm+a/kmI2/+T X-Received: by 2002:a17:906:49c1:b0:878:5524:e932 with SMTP id w1-20020a17090649c100b008785524e932mr34375532ejv.5.1678658013687; Sun, 12 Mar 2023 14:53:33 -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 gb29-20020a170907961d00b009223bf01f00si5420574ejc.873.2023.03.12.14.53.33; Sun, 12 Mar 2023 14:53: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=@outlook.com header.s=selector1 header.b=KSvd0fI0; 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 C616068BBE3; Sun, 12 Mar 2023 23:53:27 +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-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B08B68974C for ; Sun, 12 Mar 2023 23:53:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G4pWXlVIsN/EXzgfeRsaoyU2VWgbN9JRwIb3dspo8+UiS2bpCH1cSdN9kxDRDJg68Le4AHtDakfOm5uJdm/Ibu2rOXO5kDiLjPx4ztY5/vCmNf+9vgsKsNoYjpA86WFlkQpNLozTjBOTH2+6NM0rUN6W3QS389HPH+phvRc2bfaNzuPRTQgaE9FbZcZRLFUG1siTsoKft/m0L3I1IAxNUMYFiFdnHkEQ+KijZg9TRVfG0hFlEQzNMqwOAj+JFE3ldGo5DVV6uZyU5goOwJ6Oooem0BV91Yhg4AqvNXOj5i5cIbbJZBfvc5Sq/2Wft9JPxiZMF1WCjIwS0JdSEFTecg== 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=NMOZMw5czepQ0GcrwYhx9fhpLOCdKr+qyCQIcSzaODU=; b=RzwrbNmKXXaRgIQm4/eP5XQ8wSBcHXymzc08m8cMYSq4xNFbumUkeyCmT1XKz9fqIKKCwfP/q6/AoSZTkBMp88doS7rPLd5PZeJJANbpFAT14gv+kaAvdia9KbW1LA/tEju+2zTfL24hzfAuIpwNWQ8CGfRpClbNv9052y35Dy3D67FZG2oFZL0Au7ZZtOG5r1IWqOVIl+cufwZZmzxuOZO0ZZ/IsS0JO0DT5ZrDWiuD/qBrh7uRfWX47q4aYFciEbugVZh6PhUyEP2n0mXSooJN9mcL721BW7syK/Aj5Ezx5+ONo1+vzVIIeHnIz5DSRp57oMA8Z+m7Gc7yRegJIQ== 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=NMOZMw5czepQ0GcrwYhx9fhpLOCdKr+qyCQIcSzaODU=; b=KSvd0fI0+/Bs6by8dEnJKq2WiEOSO8AflLrCHnfyxUUvS1jnxkvL6R7xc8g7PiLhhTRk/CvgzYkSoPgNMbP7pfd1QPTAZo3MeC6GzFfFbb85FQ1yflrClsYWJKlNHEbxpY2v/r3YrlqKQUPKEh1HaYMAb1yzUTmUb96ggyvtbZgfyymLJSiqTBEFGyBJDAyv4dGFoQK21ZkAtap5INFJa/VIH5OHLIVY3xFWjNBqu4PlrsHWbmQkYuj9KM1qlbVgOClDfINUfBu4iBJeRMlXYrdlN9WRd8Da6iShj/z0Ya5VqEUtruiVGiwTMRt+ElhJuQK/CFRGbssFORdXk9RTwg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV1P250MB0907.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 21:53:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 21:53:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 22:53:45 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rXlVBORyzoI+ium5CLG/iMAeHqF1mJFfDuU/+DVVkEw=] X-ClientProxiedBy: ZR0P278CA0079.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312215345.468293-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV1P250MB0907:EE_ X-MS-Office365-Filtering-Correlation-Id: 0539a40d-3417-4aa2-27ce-08db23442f65 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U+U1ZWuGeDU1bs9Kn9XKtcpHFFmg5duIzpAKAjef17LUmJKNQBTCBBuNytfrKb1g8Y7kajY8oMif1Q72+vPhZtGb/eviNMGpJuj58o3Omac4bBNc/5m21kvmb0ggMq9R2W9pRzgL6y12A0+kL87Q2r/pfJ31N6DLQMxaMj39qtGN9zjTB8e2RSo+WlH8KG5CR7zRXZzVBz1xlPOxuNfLt6jg8eKKOdsBDd16ZtCy7CfHlJn9M4U9YiGpCgaoYreWNOckASbWEJXKEX1wzc899bilNl4gxXCxdC52q1EZ2NVrQTKbwtV+3kL5DFyHgkHEiLc67R/41Cub5KSQ+Ajo5HEDxNSXX7gfWpuTQfUtiOPgCg3/YMwijIDDjpQk164cSHMML0ZLipp+qIHts3VJetE9lHAm2QBlC8TIMMSsReZeJHbMyhY1n7PAAaq+LgHb7ZGSMcfFbtcosHa65x+GRfGEybNwHblEMYmEuWg5WXdIbD3X1dKeV+uXQxm17R3Kfv/4NTQYWGpxvnOcexf9e9PzuMar2isRnaMf26MMteHaf+YDlyGitxaZ2zjnFLI1QYDsZm7Y3nJQpTLw2PGVYZTK37Hg9sb8QUHqdyG8ofsDtQoYFsGUgBuDYEMKS5D8HEhRPv5F4kNQev9ZH+ijZShTBAzEhaMKYpu4FRoQduSTAp4W4Hg1PrRuY8aUujAay96kgdQy9EQIZ68qA3F0goQFu/MPRUwZ/Gk3b34QI5GDMIJkvzjH+Ok= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QvwmqVZDknxlHBkU13izs+3yOBed5tVnVdaiChd9+4inAOcjBERqo8wnPcbNgpXbF9w8ef7UI5A/hOQ58d6xeqqMKCsum85s0RqqgFEwDkUEXrOhQ2HNqxQ6itL4EkIGta8ivOF7T8RqFpt7XUkwsLmBnqR+UQDBtrPcvL2+uW6qHLsHKasBEex7HGJzOqtlrJyWlohV9+x6WVgODwCvD8EyRj/FTd5faO6wkKow8o6w4OvjPnGfpzpTIj4p80tBoZbYonACgnvqcnqMk/87hZUl/DU1R3SLbEvi9hFpuh7cPD2nsvJYnVG95V/tpYeIhxK0usv8BDhdc6pN26epRrMdpHle15z3dI2h/7+VL6ebZQXVimh8vnDOcQMw4MhCvTEomL4H9jCdK8JL5BGYkCOsNVTacUlTaMII1tbY8N9GljbgkqrhcjC3lJZNj4c5PqBW5XKU/UyAfju1qVFTlGOMc5q2ZafCV5a+H1zbGhJQu9DzbQuv3pp+Uo/i6Bsj2yZzzUGMN2Uiz9pixRGZPq0F2g+dHm8h6Jqxx1f8HUnjc4kAnI6KVZxBAUjKkjrf0s8f8ZQgh3jwCDJDPFlFvkT7Zm/rBIBLLpJNDOb8ZBlACClmX+QHUQe+KAH6X1dS9e/cywzFPYyWnx8/tYBBEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IyqlNUddBjy1UPt/5WCMzy/JbgkcIedNDP7qWXSSm3IOCjm7au1hsqZYK125x1L5UOXrBYFvgjdoXPNCul9HP1hiPmeP2bcEqYrPL4SaBo4/Q8ym4qxqIoATy6hh9NIiVW0FlXXKhNojMUUYGithZW9/4jSGCcb1ks6NnE6xdmhftSfCZsCf+QFQUOC8t7FCtCP52LDSrpAztzwUwv6zS1Nz34R0vepJdAKXUjv4XD0NuNboCNbxa0HVOaiubX6ihPrQpCGFs6MRVDyKO2gWcTB3uglpZxj3v8/2AZL25q0325ZPA7Ku78Q9skxepGutR9fmJVQjPwyl07HsJlQpAnBOjCvW/VfqcQWBDpq8atyzj1zUjClhuahEPxlzBaUZWVDPxkKSMqasp6xqV6fDceBNwyjfYP5kde4JzT/cg5W+q7CIJHkYJJgpAdX/PiLg/56tp8MYg9sL4svP1YG8gPi1fDiGZ7JGTAf+a6mjcVIV+YJU8D/YpWJmMaELgOsr6q+sG4FAp+5lo++3A8QhRxPdDVKXE/1XkHiQz80BU+MpMkJ0hzElu+/r5/RGY5BX7QHpo1/Fxy0zprru5GR38ifucnP09OngaI7mgu5FkS93tlzY+7YBPEVutG5aDop0Z6cjcoZ5Loodn9oJF124SZAONdx4XkBF1hFYk0cW+zdyHrYAVJdY//rd/ZpxrYEo6xwbAwNPMEeJFdmht71n+fnlgRpi8l1sebFzKmJavh4/yebC6UP7GYGHL/Bw/QRU+t1p4Q88Z5uc77is42xZVRudVXD32j8ayw7k9/UbBweJVq4J8AqGQ7gwXwfEOxyixzkLCEh7ES5OdQSV0ymCf8rC0n/fhTrJQK2ik+7X4mqyLdQHSGviSRmYs1AAHb+WWnPKphxvOrT2SG4uON8IgXeOD2+joRFsGZXmohPmZrXwft0W2R3Po9K10IGcntTZuyyPEJPHDhUo/fLh5ZjFu4PHN3firpQtqFFWYETTNlZfC4i0H1JfadyKUelJb2Ptmy1LgzTvU9GBCssZGu1CAc/i38R72mrCywu082kgRgb1fWf6Vo3L8RdOr+8kEacwpgrq9xZ8yR8vk8Pqxgicg5uV0aHR5iJYSTBFcTkHuVa7NoqkJIarRTkCbV1Wx1uobh4FiFd8AUckmS8jrGagX953j65DmElJ6ggmGORxhXzasOy/M526N1FTmTmq1yRLWewhWUGWs94RboMwZxs4349bKOW06TudWekrq+N5+mEqTZuhNVRwXf1AYTfDsUUCwedhX9EV+/LtoKRZ0sddOZiozqrEGb1SLegiYcODTDI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0539a40d-3417-4aa2-27ce-08db23442f65 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 21:53:16.5619 (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: GV1P250MB0907 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: Fix leak in case of allocation failure 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: clauELHhHKbs Fixes Coverity issue #1518906. Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index f65ac5dacc..e59939a8a7 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -503,6 +503,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (sei_data) { pic->extra_sei.payloads = av_mallocz(sizeof(pic->extra_sei.payloads[0])); if (pic->extra_sei.payloads == NULL) { + av_free(sei_data); ret = AVERROR(ENOMEM); goto fail; } From patchwork Mon Mar 13 13:22:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1750364pzb; Mon, 13 Mar 2023 06:21:47 -0700 (PDT) X-Google-Smtp-Source: AK7set/iTJh2yWK9a21KnS4re9i2Y5e6KU4z/9eYdjJ9hrxhMVMi+80cSYkyOstjj+r0BLA6jFLv X-Received: by 2002:a17:907:98cb:b0:91f:b511:4d6 with SMTP id kd11-20020a17090798cb00b0091fb51104d6mr7762645ejc.6.1678713707748; Mon, 13 Mar 2023 06:21:47 -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 mm11-20020a170906cc4b00b008dd2d2adb3fsi7583524ejb.294.2023.03.13.06.21.45; Mon, 13 Mar 2023 06:21:47 -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=VMMiPh2K; 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 85D6168B896; Mon, 13 Mar 2023 15:21:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21D9368AC74 for ; Mon, 13 Mar 2023 15:21:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jfdDRWCj9aq4zXtnmGYhHAexfgJFD6JVvDhbaoVs1LHDVXeCjfR0/70jt6hqQnOTHun3zmuOIqj4xceU2H3DaTTuk6SA8quMTbaveGIPsqK5v3glm4/+AatzJotczSLG8PeHa/6XZeNhoQBRsawPHFdL9sfdhaKgHSRBMEUb0ChQLy+AN2+Pys0TtoxI/5O3Ug/I059mw0grkn8Y6uhbUp3ibUmVpNdNvSkmIr7ChFb3ciBYzxEPetJrBLC+fmQ2KUrZ4Fgxg5Xlp8lQCJ/OiqkR/GPBGCUjlImAMNjCjel2HOQbd9/oezNTCi81FFH57FKgPSTAnY2JFHE9zMHcdQ== 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=A1xzkgbDzP21rvp6J9uwRNC+ZHMK67vlz/BRlzi/pFU=; b=FCZDI0Dekdl4CYYUVxg9lqZAa12cblBmtmUsryOMGc8eFUYxtAt17e+5UShDX7UctkyKHiT06Mg4yVu+YX9rZEvkgq+YCbaD0mHXzNlTUZVhYo17cIvqazL/eRF3TebxopQjEjQdMjnGSJovWCUgzmoaRZqoELl9Yne/r4iTD7LP85N8cbzpGAvId4mF0VafI//U8ths7edhIUa3IHguEK6/cKn9fzsks5vwkKvMwa2JL3BJ8kGvMxxQ/Y8p4d7MDPsGm0MwKQeYsbmJeO7Ts1RVK7Ot2QR2HwenbHBEloJjGw4BPgzGD6JT2z3LW8iNhOfr3CXYbWr0Dv3xwwTnIw== 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=A1xzkgbDzP21rvp6J9uwRNC+ZHMK67vlz/BRlzi/pFU=; b=VMMiPh2KeUDaxui/rvzpHsrmU2oaseimUvfVWoCW/nct6DTnoGy2brgVLWjZmsTmPWMunudBDL9Tys2q1qkGd1EjPv+Ym5+tfVwbOC7K/E42eN2TBikvNORByKl8hz1qVzqFkeslFG/CbEVxePEbICI1AO8Y78HnUICOGZ1K3t2TT8dPuLxw5mQZXlbMRpqx8KjloPERL//IYghDqd+LbrQWgoZSW/cyMwsu1KSPix6nDdagQos4pAp1amaZWxDuAZewrX1OBNh+oEcBN2EUf8W6famep2+8jPif+Wr4ZPeDtYn5WkykJ0u6c7oSPxC2/tAEuxqsgUUeD8RcnOlS7w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0942.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 13:21:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 13:21:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 14:22:00 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cED7MQ2n5ESGgeneR+aluAbSEDh+oFsvx3U/D2W9/6g=] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313132202.647554-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0942:EE_ X-MS-Office365-Filtering-Correlation-Id: 11c0245e-40c6-400b-8f1e-08db23c5dd36 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqzsTrfB3bxuSktp+L/yXkixHzlEOvYeT5T/A318gsA997z5TlAmuv7YzpXqu/hdomVE/s5+iaNR+JbtXIHQh/Nk/wpSIDOAN2k3YFK0bC6arNN/9Oh5AuxemUB8NsX1k9aPBCJKfXPQLZowU4NZzP6k2MiodDbDRWx2xU5xh+386cpn3IuhtZ8C5XoYX6jYPbevNMescRfDJ/0vYc5aowakCPtb+/JA05Nj7DoN6hBzpfLSu6GfufwYmJUFWEl1krnq168ETk4k+3K+D1FhG8K8j7MAekVTjBL+0TIMqXnYF18Ngkzzp0zSmFAQBtgaSjj9pvzXjg71KGnuRAWm/hWJfPyOP+Zv3tdil+4udawOJ7/KGPfeWpaYJUa7lJzvulTKMGL5ubwS5PkHewgLVtlFkc6C86QYL/aCUxr7nZbx+IFhXlJY12ui5m7yyDMSSXyPt9bfRSG1QgTUsxLlFCMOWFgoLglJQtf6iRfD5CHFmlqtt08xN2yjWlnzDrtWxeqrtJHTsj6GRKIZT62WEtEQYi29caTKC9bz79C3RItenBO7AbBrGa3mp4ZeGTpKAknFGO1xPsTt4EV5U7spOBQSGpE3RSXyc1NZh9Ounrhlbk0Zcao7qjz1wVJEPYju21yf36AnK8He4iFrqF0QKUJPRcZq+9FLkhiKNplJhjB9qjN0WZx6guhdo0EDQS0+5COUblnFCI5iJu0OydVxTaaKYHihRniQug6SMvntmZB17xFfYnYqz3/yHPF8Drf93U= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fg4YfVrPDtFH3L4fQMfH5iWXL9H28K2DwAgDxgYVXoZD/lP+t+lWorfXEJburCdL6OTESCTt6cznjTy/McKZahtINecLYPDgC07pT4WLBK0ubMzLFlBKm5HO3z4mY4WuiqSr/qBKdudvIACFjYPORTLl3OtSxBTXK7+1oEC0VYUU307P+D6S4at9DDbqC+DfunLC1M3KEsfJ6IKN8QqHquZLbBz7jN50dCzsSNkeLaknwb4B7h5qhuqGjbs/nt19lC2ZPdpE4ORe4MEm/1FnzRuIzShNDs2p3x/48FdrMbopCi0fAW5KtWSrwno7aLJVqtH1j3Q4NcwNn2W5vNtCsYO2uam4uvk3pBjeYydCwooDavHMiH4F//bhGLteMXeAoYY7hEG852kLHRo684Ic4D9lDoqULCboRdKp3Bj4BtkO5dP8Y0CqXlTnRKHDwGAjODKYdDtwx74ZUlyAy5I+614lBVFjUC/ba1lo978Ra4Awx2Nstis1I3JgWWc847OdKB/l2wNCgLzPFIzbX54tIWb/FG3Gdjwxbf3M8bUV4Ih5TovHzCh1TRjBMkLhI/VyOSgqd9ApXPWZXLiWDH3cHAh81FQg3r7Wv1tuDNzen2zdx5FGMuZ/ZfDR+gh1/JAJCO36rcJiO/iugsejvu0BAWpciwgs1ppbI7KDub0sRZ8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ot/FQM2az2WTtO/ZJp4Omx0ntIE4KALq9MWhMlD9GwnsXB72W+UnezlSIIkx+t/+M6O2SKGaNUs3VsKZtjH2Q9N5dvRtsT3uZmIKLfh2p69LdA/5PXJs8lNQnpkzIjAWQfZYX626CsQJVDokIpWQsRRlOjJ6+Tz0usd/OP+4+SXXgHdg3SyF/OkXDRwexzmWVTqhs70iCXqZKZHTjmPBp8nYNX3iP4PlJygla/JrwfGbjjDLDC1Q5VXS05RCQZiZwLO6uWdVwcWVJknSnWBI8nH6Y7PdBYxBxfMm96UhMp6U3P6+299q8MmUjZlfEjuTmcaHe2Oj1t6D3wW0qe1d9+DtKO9q6s8YvHuzAi19ganWdIGnq52kz9CDhVCWJh4k4F0mAMsO31GBplv6tlmzH/HD+cSbDBmW7rXlu9x5rG7J9YkiAq3db8euv7sTWJiu7lgVvIOOdx5AuEla1LvDPrVJLC0rIUfTanAMk2eRhx6m1tEh7pBMfV+VTfw5H66XQ+6mbb6ule4lqRQVGPMiMVVI1rC7zpcTFfZte8vFpZ4eNPuqoUewXxTa30/3WVT1Z/gu6xwFE2XZvpkYDuFZxwUy8/negaIIzAqECkJINKpgDv66nYBALtcfS1m2FOSJzzCxk2tFxzfJQJHXwLYw4EYXpFuHvc1KpN7g3ugNIOf1RX2MFiPiwaLNasqtkm4O6x97wT44DcVFKtLXSvbJZwau0Sr/fZymeTJBEp6Xhjs1DFDC/ALpvLcpuCNtjPbSUC6txGBWdQrBmry3O1N65tqfPIF+rsNMkw77mTGxumnTUhehuqhqhJ9VB7SC0g7SscoSUkG5SpKLy8E9f+/Kz0QcvbEb1vfCCGrKkkjG9udob59Pba1br5Dr6/ewoM/Bxg4tHqUcNDyhQGx5mgFT7678ruHGbC9v7ATuQuJGylGP8vO9VxJb1Ne8QDS8KzCOZi/W9KySwoMLN2ZlV6+o5V/dZCwAjh9PP+TyAkQ2nJniq71DCJW6kgLz+NJRyBcRfKC2T0doHISh+ByR2KiQT2QIMQprnjkOWmXJ/WtrNxFO4w2wSXHPuweSZmL4+MQV0S2pcwO4zFGU3rJ9KC7YkntfM6OJIiPGLw3cQ3lD1rx6bzgT+X40mDQuPQmjAY/qsoKdStbesJXg0k/T3nQQoHiv9PYDfsTEBv74Z2d7xdmQ/cdBW1lYig3mMzgwo/721OxW+y8enukQESS2OeLt9klzJ1/MYA6XTzPEK8Nmygfpz4czZLtLw62CFPzUzN0MLV20CG6x/JTYZJfmjZS1hTqGcxrQN79A/LNkdafAcoOAvS6dDewx03AHFW7fa3ny X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11c0245e-40c6-400b-8f1e-08db23c5dd36 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 13:21:33.2438 (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: AS2P250MB0942 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/libx264: Pass x264_picture_t* directly 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: LJHcDoHBonsD Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e59939a8a7..df70e9df9b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -311,11 +311,8 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) } } -static void free_picture(AVCodecContext *ctx) +static void free_picture(x264_picture_t *pic) { - X264Context *x4 = ctx->priv_data; - x264_picture_t *pic = &x4->pic; - for (int i = 0; i < pic->extra_sei.num_payloads; i++) av_free(pic->extra_sei.payloads[i].payload); av_freep(&pic->extra_sei.payloads); @@ -554,7 +551,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; fail: - free_picture(ctx); + free_picture(pic); *ppic = NULL; return ret; } From patchwork Mon Mar 13 13:22:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40662 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1750575pzb; Mon, 13 Mar 2023 06:22:06 -0700 (PDT) X-Google-Smtp-Source: AK7set+GNa04ubT2UD3Md0fxp2C7zQFFABrLXpUGeVoTem6G18Py9AW6HXGlG4j5CCMoW43gHQu+ X-Received: by 2002:a05:6402:1a52:b0:4fb:3ab9:fe81 with SMTP id bf18-20020a0564021a5200b004fb3ab9fe81mr6170220edb.30.1678713725813; Mon, 13 Mar 2023 06:22:05 -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 e11-20020a1709062c0b00b00928fca4e16csi2799564ejh.962.2023.03.13.06.22.05; Mon, 13 Mar 2023 06:22:05 -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=gZLwQ+ym; 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 AE9E468BC08; Mon, 13 Mar 2023 15:21:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2040.outbound.protection.outlook.com [40.92.66.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C86568B8C3 for ; Mon, 13 Mar 2023 15:21:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N5Q3tlX4RxpW8wPDCkeQSsec61x/hGabA+x5c1ExlWuGDwSqSK64k1WB/3A6VAqnFC1vOx4iIjsak2HNNEYEvIfvQzhRyp/Mh4oj1/LJKTmm8qSUoHdBG/rys0DGTQxmXETp4btZD6kdJSsdGD/ziwyxkHqJuGVEEQSMjq22Pinsdi9zkAye6oWgK5RC2+Fj+/wyWFEZLPvRm2Z08x1rfVSOXvdGysBn/XOl+AuGSDW/pmG7xJQf5gsmuDZzkoX5T8q3Di8m/aDqePsE0RXGeDCXrK8hUTNdZg+P98qZMQ9D3P1OCRQnRLlrPik60uoz0eYWHUugIQ+9ay0I9WZ27A== 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=zK1PkszRq7kSsH6fDxbBf+TOloVnSXd8vw6vNyvoYcs=; b=TzXhIl4dMrfGmTQdsQufAy5U2RxJ8FwNrgFMPcrbsrM3R4Sxx9rnDysrZdgCQaphQxI41m/EAW8bn96qTcF+dB8QS+lQcA0RzDhXNGvcbhl5SCO5nzfvFg5EK6a4uU8ColQ8SzdcuU5wb2OdpUl/9SJiNQec3U59iYombDS2UKz1vUHio3OIcPnAMUH2b1WsDPD+ThyCghsLabITR0MrZkQFL0jD9m1SqkQJXpf3uQCAvGPCbIOdclDDMSzLmwqS64G9cc6SqphadHzPUUmnxTgxu8Mks7v2LXh5dGpqcHjSqAInmNJZj03Ro+lijKw18yaDP/dw8axaa7Ye/K857Q== 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=zK1PkszRq7kSsH6fDxbBf+TOloVnSXd8vw6vNyvoYcs=; b=gZLwQ+ymNEozqZJEQIOUtRYWrzuOgmfyJFwniYkTAaOde18C+qXCXMxvym9BXRutJmN7L2U5EK7W+2ogV7zbUvACk4M/QCTXK3wbwZtd41PAuw9CqVV+a1+36VVX2lkQHrk1Pk0CVJjqFOeNJlkFkMu2lK8JuC+Fnj5mg8zJrQV6V88QCWW9eU7Rbbr1ZTVpH3oIu1Qr26IDgLAi9QWPXGZLK8JE6cIJeJtmpgMgXtg7KjvzKPS/xawE/AxO2rzNufgo4J0bdIE1WaAjIO2yab1bLp2DWKHReHxaZDsHWQO4nB3QOMd4ffILWBaKQzASsMdrpEm4MVbDg1/Tlu5z5A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0942.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 13:21:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 13:21:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 14:22:01 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HRzwXZUN44mt6+IfDPfYVOf3GTRUgU6l83bE8XnKs/Y=] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313132202.647554-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0942:EE_ X-MS-Office365-Filtering-Correlation-Id: e2f29978-2611-4886-1ba8-08db23c5de44 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqzsTrfB3bxuSktp+L/yXki64PfUaf8jc21dByaZEYfI3DuyMkjUdo+GbG6/Zhlq0WzfBmKMv2x96fi4oF7tNglmoQJR1oh1AzW7hQcPBmiju6r+XJt1uj+ZKMa/fAi38zRXqQ1Gt2hm3GJPf3S02cGJMao0570r2pW2JxbSPhIcgRHNGrBteKb6XztFLn0bfBXJe5ffHb2RbL70tapNutC4OIh3q1kvOnJKqHkNgJU/RDVJm41Cwe5b7F5PjG/itmOiVhm5JX9Zoh3tSILosVD1LLtXB2N6h6PAEAhAUd5vRWD2z7hH79+ViVvadB/KK6iqslMNOJXXNA/rMEwE5QQidEYEC6Q2Wn/HL/L/2J2MfAKi+XtDULnW5K7Wc7Z5WEjEfr9Lm4LyUXHjrtejsmGNa5yX0hYJlKeCTJqoXAw/JGFRkvXSK5W54OTHVJQK5lDV/A2qlQp8WleFPgDdCGacV8NlFHJliEUBVaM5T6lSzOviK4V1tuc9YlzaIzoI6m2Cp7DT0oOZClpK9rHsVuaMaSSr0mUpKL/hzoHEmOuwZkBzNZApIavJPOtmCcFluAVAGOcxVQWzrk1V2XnF/KXBZNzq6lnZXYrkyM4GNcMhETIHi5pKo1AbW6CBHhvFWkM5oI75P+3Aue+b3P2ChMc/LxWWMy0uZJL84cQg5dCcgzF4K5qd/PgRyZQvarN/9xfTde1uHa3mA6JLLPMp2m9i+rUT1a07VbTYt4zwusUbnQ6cU50t5jFHirivE3cGJE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vg3kIllWB5QZLEu9cSc8kdSFK+WieLizXwP/fCKkV0dr51IvXlSFZbnYJZ50V3Ho0OFpZPrsFFiC5GpxPJroKm53+TR87y4jlSs8ONOjffGGwKjrbLLaIhU3j8E+fRgqlT9JYA7uyuMTFa0ksjE/EfrKxtQJkYtQmstnaFdgY6lVu9QURiqzyRGLbHLJ0A861LITITfQOI0YkJU6SjRDbStKbUgHOEsd5hG0S99Hn+mlhM28V++U+vt3c0QyfK03BkQZGopSzlwL8umHtbpEjVZXv6wfPjuvIMMAaOOC0BMeb2a+CcB853VOqIg6e8IM3wnu5i2KMVSFD/SFjp+S8pg9xrb55mdLDLRAf8cGO2AXqc5EFE405U6EMSV/8GsuWmTebIhiHGczz4R2oYq8b+uI5CCbBkfKUIXcRFa9mYmSGEzaDLmKVWGFeu1R9lEeqZoTSwMWs+nOmVwsTIj7zkFun4p5H8EZYgU2hPLFMlbRnY2iE9iyN0rHnWJiVWRDSDWm7pydWuSscTvMzb00DQ8U5WG+WA8Yiyvc8vhPdIFgx4d5upOkgISTqqfJe2QWfCh859NCPpgdsHpmMu/a7s8MeYypuuMBMKJPtRbClOd2LC42rhJes9GmmNyNfsUus6/0RUZTl6hT7/FZKhLV8DBUGy7MVWofROUAsX/9O14= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G0d3GTp6p7PcBO/EX29o2+gbFXaskaVFAgsLagVZ+yODLksBn+ZyTR9xaylu73T13fdq82Q6HXybSzeY/Zzkdz4eofL3YxaRKbTgbVytESRjRM15RXFGhTDkunHi2/JokQvdnQQKhJEHCCiWgx4bUbcA8m1CNoedpeYquxJ2ASxOGAYkLha2ZavafU4MHGkr3G+h9KU0JtkgkDb2HXkgo+Qez0vj0aI0VVTUhdQiOXu3P48wKkVA4r0XGLAVo3gvyrlwGBc/KrAbb41LZcOThmIERmIvZnlvO/XLB5UWANSd6ZC/+47kF1ZRjrquXqFXw51VmMazMyaHvy2oQEbxkYfizyMW4FRM8/62zdpuMKhJcqB2esub/ZCXb71mNBDA36h3kP1CFjuumkg+r/SHiRlqPMvShOzaIySGw6KoU6xRcl9WgS8HLGgU5NUPqsw/03PEiysj2cHZd9U4E2aK2ohu5nqycLT7jWyLGpfHQgn6aLKIpZI/XXPyKlsEzQgxfRl4H7eZt4eObFJaMeFLCeoFM4kyh4WcGgLB4vwFHlCrPWz/vBt0D8eh4oH5s+a04psEGXuqtxG17qUDGFQj5h1A1k1uyCTOpylbxP/d8ekXTW1VrRTKz96agHayx8uIEvMC2BKCPY5w/kX0vErAcgybK7VXyoTqymfqKvvntoUOR9UaN+ve4F43s66QWF2EjZibLYLRkIPvEOKwUc8ZlGxJgFktIT/k9grtgz9rI6/j2+9t6fVu/0JMAGPJso0Str3zjG4Qb/UorgPA1AC4aF6c4VQ2MdOTJL8qzNWf9EfzG8w78nAXaTqNlRkYP2n+IJ9Jr8zpx/wLvd+uUh+0G16H/CI0uR3HIUfcBo0VaPwfMni3xdF6hcuO3EUcN3Q8xJo2Z9Bobw0+W6YBCzVMevRtod9OGJy6UtWp6dP7IWBVZD98JI163T3MNF7x2v79nbLBl+/afYME685Ihi2Va123rDEFegpYlHnPnwnmFBUJDYe0uS6IraRhrou0dJRcYlb3aN8V78mSJnNqKaZTB6ce4idcptRrVD3ri+Lua3qR9PUiRMK2qXqte4+H378TBQCwmWkVOF5+N+BgHFVaVj3MOQ9Jy5ADnqxH8yp1j2Q5E/tCaAik4QSedtYpkCc1x9C6hgllHtJ6Rk5tb+wVHN9aMvK6vzpuwDBzXakdb/zcftCXdO40nKuxb8NJYrP3wgagBw+W0OWmmiAMYmv+x9YDe6mNB7/DwgvjnJzI6TOtvdIpUP7Pd4+32e+zOmhIvnxHxN04R43y/gdOA3AqQ/iUXTMrbdKPDZej00YM4+ZfiMbHqtgJDzwd8Ycv7AIc X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2f29978-2611-4886-1ba8-08db23c5de44 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 13:21:34.9935 (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: AS2P250MB0942 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/libx264: Use dedicated pointer for accesses 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: +SuicEuA+RzA Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index df70e9df9b..94006d2b20 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -498,19 +498,19 @@ FF_ENABLE_DEPRECATION_WARNINGS goto fail; if (sei_data) { - pic->extra_sei.payloads = av_mallocz(sizeof(pic->extra_sei.payloads[0])); - if (pic->extra_sei.payloads == NULL) { + sei->payloads = av_mallocz(sizeof(sei->payloads[0])); + if (!sei->payloads) { av_free(sei_data); ret = AVERROR(ENOMEM); goto fail; } - pic->extra_sei.sei_free = av_free; + sei->sei_free = av_free; - pic->extra_sei.payloads[0].payload_size = sei_size; - pic->extra_sei.payloads[0].payload = sei_data; - pic->extra_sei.num_payloads = 1; - pic->extra_sei.payloads[0].payload_type = 4; + sei->payloads[0].payload_size = sei_size; + sei->payloads[0].payload = sei_data; + sei->payloads[0].payload_type = 4; + sei->num_payloads = 1; } } From patchwork Mon Mar 13 13:22:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40661 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1750471pzb; Mon, 13 Mar 2023 06:21:56 -0700 (PDT) X-Google-Smtp-Source: AK7set8ANZOBpc9igxI4tNsO2dneeOmCQj2F3K2jGv0Zqy+bSPN7cgGdi/Aax4ESwzccB/STGKJL X-Received: by 2002:a05:6402:1009:b0:4be:3918:9217 with SMTP id c9-20020a056402100900b004be39189217mr11272398edu.8.1678713716117; Mon, 13 Mar 2023 06:21:56 -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 op27-20020a170906bcfb00b009238a205577si980207ejb.190.2023.03.13.06.21.55; Mon, 13 Mar 2023 06:21:56 -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=QYmENjbc; 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 9501B68BB52; Mon, 13 Mar 2023 15:21:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2040.outbound.protection.outlook.com [40.92.66.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72D2C68B206 for ; Mon, 13 Mar 2023 15:21:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0R4fj93r4HOVqouGiiVvjgU0UudzNH5aSwDkliHsYYr1ifDllznSH7Fy6s7F8a26xljDeQb98Q7jsKnC86SVviTtUCIJlcObWpDCJJNRLfLQgDfBXfV/RD8vcTWHQrPAlPow1Y0qLzyQjJH8Rgr7toO34HteemEyOMEBDIeniLnh67RnM7OjEkXTDZq3kT1FNrov887xvPNSoxBmNOWTo9NVMrGoOTin9SEitDcHfdLOSIDBCZeF47qmf4507WMMwt3NWSqEkyFxyvnPInUNk06ESyCcN/S5FBDSlIaOVanUxccMfwSbOfCy/Z9pwOkchrDzh9jNZQmFsUcNAgccA== 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=MYLVeSs4XqD7CLKJNiRzADmJnWEzvumjS2jiciUUZ2o=; b=RkqXMC6kEfdjAWp6Sk7jbltM5zVA0ukl2qE+wMlPpi8X+J446EaIQcfqsOj0zgz2nw+X4ukXfmc3jMoRdP/x0mXnWf1xFc0wbj1yXKSx2rTDpM0u/q+8AB312yn6/fBkiqBWgcYC8edqPfs+e2qJJAzduT7qBt2RCszd02XbAJ7l0F7g65RPZeu/b7JaTtPjkpMR7yjBxrZmQpiJg00oqVTuXSmG3ec7GU/outfXEHuiqsablwQGQj6x3g5+B9nkf0E4HRwrUCCDksh77DJtXLbPm3SodqE/0hn51biN9EVsvmXwTMz8blw8P9rL9cgJYVLkKdVv2EoLnJrVKQZWAQ== 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=MYLVeSs4XqD7CLKJNiRzADmJnWEzvumjS2jiciUUZ2o=; b=QYmENjbcxdQOvl0/KwW1AWIijgVVnupYWR9NuBjx6LiT0DbX9ABfGw/VL36esxzcTmxcpYfJWVYRsBZQioOTg1OVJDsU0bd/maNafO9icAMBRCNhoGsxrNiYfphs7yByjgZDxxQPt5pNdQFmC2RhWSnESgalQ/ReMLkvrlEZ7jOi4S4nLGo0qyuJijh/pEj2PAcb1lSWyNXFchhyJR0o8YKxJxQtVdtnI/xdSC4aNJyY4qEWl8Ox1sTjYso4bZcJBM6Xh2642Yc6w+z6JyRpty/m+xqoVGbkKsdCjj2IYhViQF6OeXfNpJbjm/whAfoxrd0o0D4Xe4JRl21YNrOo1g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0942.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 13:21:39 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 13:21:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 14:22:02 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [faD15ISVu2pOxrjYh2szjPvDgpylZTgkhoWTnb0SkY0=] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313132202.647554-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0942:EE_ X-MS-Office365-Filtering-Correlation-Id: 24c047e9-db79-4e45-0596-08db23c5e0eb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKz0HU6CvfmlHmreE0CbozhAgG3BuJ/77poFYd7tA9vpCbWgQVYsJMN/wXk6oMPE7gRcTduEu70wifRCVaknP7cGdWN/pmG2k/W2YU6RvJ/aYJpWImZsrBqyhCQ62vzS8mv1ZxyHT7hUPAtsV7P+LmvkW7D6m6IaXKVyx4QMneRwFSwg3qLcUDZDZHyhaZrw4Z7EITWoy73Uf48LEcMtnJfmIiFPvcm1rMAYNZ8Ss3V0KbJ2ojA1LRY9XW8gty4rG8q77Dpyuc9NYxjKTcG1QW2dpJ2lqMafdYjnqrYMhqHMHe8Ue2o1A/iYYQsAR/xNa8A00SgUDbk86ugxPD25BUtPLxvDHwQpdNShEK/S87iBz60uJHfnk7oi6feWnsLzR4jS1c6Hr/8t91h+xhzEe0ioy3WZtHDdxd2Ym218m3vDXYN9dBHubWLei7iKb48kV0KlC/A0k3XJM7+SP1gZ7Lw2qCoQeuR4WpEZwQGkPRmVv0HvVLaak4I+cfZALTUV5R8V3wONbJeW77VmpNgBdrvlct5voJ/t+FUY8WKmOCpB9oK4VkGJ/Tw0aPwhHLBIBWj+7vDkJEz74eHym8lCwieZsLS25fPxjqBrxfo6pVDJyauWmh6khspzewEWEeqLhDT3QFpFIrsRfSE0B22YGIajY/mc5Q4o9Bku8TYKSEcuJ+rz2Yfrg62CUMo/z9gQhbBZNYlHQYSBDMGJJ2+sMqfnMTh1I8YVPNM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oRSdZk33TZInwT0Cuuk38MqwWoNKYeRBWCjrRuiGlSelaGKtiuoEZzoQ81UJ8/40EZpmMfWZk6fnWpnEevLUMu1HA4RKBMAqsRv/+WVGnd5XMqcPc0HKhKDT8k/IArwgM/z/HkmZxcmD2vWWQKm/r6NyXr+4jgetO2O/RkWZghNCnYy4LFAqagGN230cHqu9h1C/tluDTDIsKs89QIYeLYaH+8aYcjoi6VdhNW3q+L7E3Q2N5G/lmQOj2saqCL7yL4PXzR5E/ThyED4cQOBU251vimgq7aMYpF9FTCZq1W74St3+pkPQapAjVPEtRv+TlQAw+my+II9bUUyWO5unuwglhEXEjdKrOAtdjeYNZdJy5bEYVph/g7orbgpiMllH/NbwZuHUmmEahn1XSoEA3YKI3L1e/3TCXUnnwVlLCkBqTk1eALhVdintiyv8MPh1cr3O9BEroE6XMaHnNSlAkYPLjeCy8VfUJoT6gthUFoxUAcvX9wIkypJW3wLtMV/E5jm0TyDQ1xuxriV/61YDPSv837UWyF6I6twXhQWD/uqpxhga69lC/X9IGH4cB6hhaXRHwGzNQSnfqrkobwsXmUs9qxeJZY2GxvA7frhEPYVnsS8quucaRxJGod7mN8ms1Cobr7WRI6e55vL+M+52+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k6ygikUR3PCMbRrhj/vB0nVhJihoYkglNxuNNcOtsOmWyK3YHP5bU1ewL133qL2sVZN2zNIHx1gs0cI6Q3Xdl3Iz0uOhDeTKPobiGGb7Ux+hsEc7TgN8SNl29qPduT/o6bjcsC+6W7O03K9J3KawtCnd2avV8snvmeaTTVc/KEt90DA1e5tOX1XNyMZxeAC46St47yh0U1Do4sXp9JIai91nDRKZpBGyiSnIYdMOCWGwsRMv02NaiKGL216LSMAdUKhtliHJwuPXaNg3V8kfYZchz01E+fVplu1E7L/dVHwc/mgP2Dg+pXLPQk8FJUziL67PXb0fVwuKZ7DtInndlgpMkF4FecnuWlF/i6wg0mgNbAkNHXMFZotqhIlvg3/EEX4iKh0reQ0snQfZgeHb7q76F5NzsOE1vZY+Fp2uHszaBQ2GeOox5waLrzppgSS8bwp/UZT5u54BKCMRNY7ENw7TsSHmxUTHe1Ig0LB2UK3Xw1Rop39tcgQQYbXosK+lAjICH3xY3rO2uQt4vTxH9kbUP83dh9Qfxj6NCG2/rwPHNLDrCq1zkw+QfG6/5RWhU5i/VFyREPplJUYho9xWBLDxKDwgIHRWvDivSuTEvZ5+L0L4+692K9Rp7z+6q4XiYkrddsvCOs04Vn5Lb1uMqCMUFI4Qdk3Pq8zyo+s/6AglqEk1SBmgS24GMtZ+aZpRzj4d8VRG2b7Z9jt6ZSlpPYCqcWdW8dpxhcO+lD3WD5IXADWlau0rAmjCQ0sS3eGOULMlDd2gbK/Lk0WwyptOlnfbHGmtx1OD9MIksqfwKULGJkyOjLI9qe3AbZSa7CQPkSA1e2//+ip1Ft60bTMhZdcL1zAdiEKMRv8SbRLfGd8d+clslq3AH2b2tfsLNYzsNx+QkFc7TcleDYMDsYSfSXmFktxblzwwAVCqBYgY647VlJ6yXKrI9GXe8eHn4dXBD8yYFCCDX1CbLmzGT0Gil+0HhprELsC7YGbOlUw+jaQhX1FV1en6sodB35mIHyY+nCS/Xg7tMlfgkARXSEm6h6oFwQz8ge15IMTw52aA5PZgwMFHiRdE/x7RwngQoTZtY/5iIUKZDoUkSDsB9BkWakY6VhB602X9BPWYfCrdpbCkon8l+Jwq1jEzcWHMyv6GD0VeEwXrXGhliZAna62fI9siwOOzVCnu6GLvHHnjlRMo0UABZmuAuoYFwe4ANu3MSaV7g+Mg+zXRu8cV9BUi+eNHTouquJXbd6dCL94mD52LOxH8+Aqky1AHvAR1IkbfZFk387VTRFd6LLkrfYMrwkoobPjmkli6IeEx4NO5mZM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24c047e9-db79-4e45-0596-08db23c5e0eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 13:21:39.4285 (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: AS2P250MB0942 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/libx264: Use av_pix_fmt_count_planes() where appropriate 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: 1V1Z7G5oWOV4 This also fixes the number of planes for the NV formats (this seems to not have caused any problems). Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 94006d2b20..92828fabc3 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -189,28 +189,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, return 1; } -static int avfmt2_num_planes(int avfmt) -{ - switch (avfmt) { - case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUVJ420P: - case AV_PIX_FMT_YUV420P9: - case AV_PIX_FMT_YUV420P10: - case AV_PIX_FMT_YUV444P: - return 3; - - case AV_PIX_FMT_BGR0: - case AV_PIX_FMT_BGR24: - case AV_PIX_FMT_RGB24: - case AV_PIX_FMT_GRAY8: - case AV_PIX_FMT_GRAY10: - return 1; - - default: - return 3; - } -} - static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) { X264Context *x4 = ctx->priv_data; @@ -440,7 +418,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, #endif if (bit_depth > 8) pic->img.i_csp |= X264_CSP_HIGH_DEPTH; - pic->img.i_plane = avfmt2_num_planes(ctx->pix_fmt); + pic->img.i_plane = av_pix_fmt_count_planes(ctx->pix_fmt); for (int i = 0; i < pic->img.i_plane; i++) { pic->img.plane[i] = frame->data[i];