From patchwork Tue Aug 1 15:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp38580pzb; Tue, 1 Aug 2023 08:05:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlECTHE045fXxJS8hKU24L5KtiVumam/1R65ivmPoweZgNq4N4D1L/S9nB9XVsjXpIegvACe X-Received: by 2002:a2e:8508:0:b0:2b6:bc30:7254 with SMTP id j8-20020a2e8508000000b002b6bc307254mr2614833lji.13.1690902335375; Tue, 01 Aug 2023 08:05:35 -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 va16-20020a17090711d000b009874842217bsi8998979ejb.441.2023.08.01.08.05.31; Tue, 01 Aug 2023 08:05:35 -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=phCJZe+q; 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 BECC068C569; Tue, 1 Aug 2023 18:05:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2100.outbound.protection.outlook.com [40.92.90.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 995DA68C551 for ; Tue, 1 Aug 2023 18:05:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GgjN/4/nfpfuzzuVh8lk/GiTvHARngBH4phAEo/1gXEn6pAdkjBChpCoqWHkUT1euMhfoZ2RdbGIpubFzV/SlL7xS35Q9KeFD+Gg1QxGAZ/ltLE6PvSAtc/LejA67bsF5ru/o0pdIdVWBO+gxCmL1gesX9oLHWGsmMdxVgLEYZHBs1CGq7QSQfFd1jOLMbKmQKM+3O4L+xjvl6CPHfPc9plenwDPdA81dC6gW2ulNwoN24ccwbXVNYRxm9XQBQrmO8nAefU3FSd2ShWbtlXioJjb2ZKSGtRd/ppCwh4GIMrYFyyq23dZKyhZskwspp00LKw5rdf9nEHuXlboba/nwA== 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=/u/Yg4CcMjt8f06YoalUkRLznFcbwtKjz7Sl3TuLdMo=; b=bqzCm9v5I9gYjIu7vFdPIyK0N+q0jstfN/SSnrMcLlKDyB+nQGvDKzfhRbC/rKoOFhTnOmyyd14syLn0vYjxWUd6O+mD9UHBc1ZTz+0+1satPNcl1vTdRZVQwcbBUIY7wOPUAw9OvUcyzoNMdfAsZSe2cA9/DSikC9LDDN8Ocj3UPm3xFhQ3005xKs3Ux/ZLaH4k4BBPTTcatExHvKwbdLHlc5w9Xs+aWF0/Iq+uq5FtJxBtrFi8HGcgjrfsDHEYb6kFfZ0ET07ToRcT4l2qDREs865k5njjT79hbVtUiFppAfmqpCj4ADdO+vUPr9Dum5JXVQ0ZWH8doCePw5PGDw== 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=/u/Yg4CcMjt8f06YoalUkRLznFcbwtKjz7Sl3TuLdMo=; b=phCJZe+q42JlqOGqCyg+A8gQ037AmZuG0NyXzqDeFiRcEp4T1s4e5rlPGZqFBDp3SqDbl4Fb6Vz7lwJrnXIDy17MvwFEfKEexGcQ+OxcQJxhW7QHGPamh1trlrko+epYKYDa8Jntm9gqYKKhikS8z1h09/CVh6hkZHUJVtSNxn60qBWjbjLlkPVDG9clNGBxFnn4cWrGOnsQAvTpLXI2EywScRkHi3CIR1ZDnZuP022thBWRrj9uIJhJZsnvGHE0YAOrWO6LUcoZ52OvgwZ4iMZYVpQAWZX4dPKCdtnlAJdkcoW+npymhhEXZnLk0B9BAWAX/EUjQbiyJeeaFeurcg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Tue, 1 Aug 2023 15:05:12 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:05:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:06:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [H7emManVmLSh3Fi7YLjXfojinhhdplh3QOAFswWup7g=] X-ClientProxiedBy: FR2P281CA0092.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801150608.3756402-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0080:EE_ X-MS-Office365-Filtering-Correlation-Id: 922ded76-4863-40a9-2786-08db92a0b477 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzQ+EiUC8SRy0T4qBvxYSEKvo8A5uDmnKbug2jTndgna1oGvPpt4QbXc5mz6zzseKTKNnredxgjZS2nwPFZySRxuq1s+dy4u/K9mAfAvrEk8B7ehgMjdbOiqsx3/Q9FzaclH1+SPy39zm5O019INIBuyUCTn6C4WTWfLsSoN80E2urY9UAE832cVEwg9TEv+E0T+qUu/RoZF3slndPIHCQ5hBy2IkqIigfmg5GdawHMDFTcUdcqJqMYXi5HgacLvwQdk9ODcdZx4oKRE9NZgxukBoHlJUPWlPQRmHYLz2EUVuVqXyxyuELvk3th1gzfxi2FWCUTlr+kHLuz4zlIAs8jggMciqqKai4FDWENASwlaXX2zcpFKLbMrM9cgRrhGQDR+WmNljGryK1TBcP+y9DROwG9iLGTCOvalpa0QbOiUj/cyFtogoIxFnsTM0qsdlOMhOZSyOs1YJODwTaZ1i0+cl8PMJuUXLPIZzadNiKIprZdAMZV3tdL8LVcFrMov1/0URs7zEVcigK6yky6/cCXWQ2tDrpOR0qT+Zfj2g1jRQpU6k56SomNdVeLf9Qaf2AUVuR7nL42GLURLAylACZWgVVlxtI6aVL0cHLgdNsm4pSZCHtbNft3VO7pdqgTMdF/eRtMDDUYRvN78WzwHlr3yRNPsn7YfaHQHA7Pc7DUai6HzWFgp1JiBJnLjFlSrs15x/2VxbZMs7phr6495tqTMiYOK9tHrHM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5foe4btUZm/hokbMPy67Cxvnoq8Y767HPItJxX10CLw0lt+HtjpgDthZCNIaBA4kxlwkPHfOPaK53tOtsSvNwyaStTecb500nA4Aggolz4BlF8LxGxehg49QieXDivTYpt2a9GZoFSCk3wxk4fSvV09LZTZP6Gp21h3p6PH4ObvBiyZ8AtPDjBeB8Ir87kM4dfa/Uqsk+tskGwgXyzKLX5g/Dio/vpqXvHI0VaA2ZA3iH+vcwOmaVUDCe8NGEFs83Vh6quzKZ480X0xKHmpfNRZWZ3S4Iv1HN7yeLA3IZrvoITJ6VatOCwdJVgpIj5RqodFmTuaxi8wlZpNo2ng2xMQfhGGiCD3ZgdEVSnvRD1zqlFZExk8WUqNHmhTXjmhgP0LkTWlrV3IBpHejgq8BDPZKAHFwkwy6ay9j/6P7s9RqK5BVV4z01cJcVeiJYk6EhMGaEghHcXZqSjWxNPCbdDnVaqTSlitHjzPYDuUxPvQn3psGPIw4IwX78sSHFl9wt8io/DrddNZUH3aWuz0fuZtaGUop8lS3Br222S1TXkg9cB8HcBa7ii8XgS0h37JUTQxwFxqd9mZs+b3xjWB8uUxmHkfmXFtZ0Szh3GgbOkxV9XvTq5q5SeORAiMCDfLz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JvwqxCCf9Cmvi8Rpn0Z+CkJcOM37cI0AFJ8A36O2gNOWLfQlsmqSxeNvDuHq/4bOWrZFIQ5XZ46YSfOBZXNdHIeUWZX0hr6KgKhNebsotrwzCIzCwZotEfIJQqvIVG8RVanzv9y2ksVrlX/iMscR4XIbPAdAjy3dieRs3I6vsmrGOd/rW44RbUtqM95+1+qJmXT2F9zMai7eoJGEBSFpxcP3kZ+wNJYuj71AxczDgnysF8f2+gguyLc7JGuXOiI29x43Xa0fjOHHY6oTyNGF+Cdu5z/x6O9GU492hBZToO4dxd55WF9taFrcfCXeNZe47hjvPL53Z8ksutOdcTJQqKdUuc/v9XZOkVuRryx1wj1CTsrvFQb9sahfJdS0v4VmDJnZIZNQi4rkK/1CT+BuVTTQ4JkK9ZM37AOX9LowVMj/xLGyHA5bE4hg+bC8cMSpMmnG85AHgNnC9nleSiMYeKiU0CsjlC+wbVFpR00n/e5lzfcJmEJEQ1u2PpFZ2Fl5RHmlqLgZuOVF4aDVLOG73ZYVlZ+gcJ0lR89e6l7GPsG366++zqQb2TJRzcFnsotF+Cpj33SOMqxxMXzDAW9NMVfQB0GzKxsxypchUe3ysLyYXinm1dZ2ko/TjHJLywdJMQcz5OMqg8qVkBeI8arql5Q0K1CQzREMrXFNfQIucqic6KB8GidxYoCj/3y6nmr1LIInYUEao7Zy1q7g7M5yqr0TniKHQYiYoEA3jm1D1rxRWADnpkNyfXtBiWAEgT+FliQ27XwbxlBZEJUVT/iiPX7RzEli4XGL391C3ke5m29TUFQy8si0WRsEpawjB6kUEeexVZ5ujWkYqOqMxp+Oim9heMSgx5pv3Zk4GuTvqHj7TSMXbLyyLJCx75Jz/iFuzcMrHd+aRWC4y/Sg/kwJzWK9t6JDX3QSV3vLMBZC2h6SGSGuz6AeRNKvxO1FMClJGPa9cIzfQ5L/OzsZvWUjeLMA36SQ/IGQgqTOFOoWnhopgppMn07vGnHXlTIKPA0LC1zt3kbkiL3p4XiM96mVeCt5UwBKRYTOKMzkLIyj5t4JcXaZc0avdK/tAAo3NdboEhAo6BFoCh7Znqg7FEZdU+jY3EgOwaqbOAJDhw4bPjl4ZmWZoofLc1nH46uHSrcL7JPFR1a1imGZuKR8plj0pSIYyW3F6HTeOsdtnINA093/uZOmQda0Ai5rnqPUYP7lNiWkGnYEFDGWFzzm2h2Wo5yVLZh4IQ1p4VFG6R7d5UfPvmXhf5TVHYdvJbRNxLHj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 922ded76-4863-40a9-2786-08db92a0b477 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:05:12.5946 (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: DU2P250MB0080 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/nvdec_(mjpeg|vp8): Constify AVHWAccels 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: G/SqZ6p8wwKc The discrepancy between the actual definition and the declarations in hwaccels.h is actually UB. Signed-off-by: Andreas Rheinhardt --- libavcodec/nvdec_mjpeg.c | 2 +- libavcodec/nvdec_vp8.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index fce464c1f8..daaf0072ed 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -69,7 +69,7 @@ static int nvdec_mjpeg_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); } -AVHWAccel ff_mjpeg_nvdec_hwaccel = { +const AVHWAccel ff_mjpeg_nvdec_hwaccel = { .name = "mjpeg_nvdec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, diff --git a/libavcodec/nvdec_vp8.c b/libavcodec/nvdec_vp8.c index f174ca430f..3812ef3e1a 100644 --- a/libavcodec/nvdec_vp8.c +++ b/libavcodec/nvdec_vp8.c @@ -90,7 +90,7 @@ static int nvdec_vp8_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 3, 0); } -AVHWAccel ff_vp8_nvdec_hwaccel = { +const AVHWAccel ff_vp8_nvdec_hwaccel = { .name = "vp8_nvdec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8,