From patchwork Wed Aug 2 06:38:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp453364pzb; Tue, 1 Aug 2023 23:37:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlEN8kBWsvQmrrrEffZwoMK4TwumocguGfM+xMdFTUiTzsN0USEWx/cVbjq5as8tJkeRlV+w X-Received: by 2002:a17:907:760e:b0:993:e860:f20 with SMTP id jx14-20020a170907760e00b00993e8600f20mr4411296ejc.19.1690958240289; Tue, 01 Aug 2023 23:37:20 -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 j17-20020a170906279100b0099bd1a97e1fsi10657069ejc.995.2023.08.01.23.37.19; Tue, 01 Aug 2023 23:37:20 -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=bH1kNSBe; 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 04FA968C54B; Wed, 2 Aug 2023 09:37:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2044.outbound.protection.outlook.com [40.92.73.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 315D868ADDB for ; Wed, 2 Aug 2023 09:37:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XRPaDmIxZnfNYGtVe33tKY/9pTaH0lcIZJFX9whn3Yh2gC3GQgySpX5bQKJQlt0ekM0OoALFsk1eB+IAKL1SclHOc18I8uGrBI6hKRoqlj3MF3p9wXYHE6HAgASRw9QJosRzH0Cv+AGf7Yaqk21HR7v9KdnCTJf2oCiSzdbjWcxtz4NjvdSPqjtVYOVzef5ojMaexkoTstj21dyHT3z2yUKcjuS4bAmJA1/HhPLAygxznhj+HacpRJW8DkvfTYOkFo6jnDUuEGISC5R7ITWNvl3gPhvOI6zgD96VZtmZVGY+qa2Nb2bm5IMM4SbdAW0dqgm69YYkF/BmH+D/GV/15A== 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=s67BGI5U8JBiA/f5So9vxGmBqP1aZlp2IbmTaRNGEqU=; b=Q6a34GWcbPFlG9S3ZplXo0NiO2PDFodogk7CxefxDM/bJBR76Cb953fB+A/QJjtnTEGFvXFSQ5I6qdw92H+rE5Yi15G0v5KFh2MxAwrUmifZUiSPk5j1qLv5xJNeH94RUBZKMKp00tm7Fvf8YbJz8AkjdYmFh0CGbgDuSjSx4WHCyIu5Xun2aT9hYSu0B7TMELicfxliPSsPVUai41N+rWTEDmLy6QXyxCl5X6d40hJDzNKclMrNtHVsZWOvJE6lo5e4IW2SBzecEeRvBOt0I7Qq6Tf4dktRFvIFx2oruBoaKUw+hQePvTEFeDmmHkuSHU+yllbxkth8yld0Fg90Rg== 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=s67BGI5U8JBiA/f5So9vxGmBqP1aZlp2IbmTaRNGEqU=; b=bH1kNSBelUcleBdmvrOuewmSDbMliBGam7ZrwP7HozLqvMW151D66weSNru9sY4kIhrpEIBQSYEtz6/2VdvDGc51TbiBLg2GdAiM9kyhZHQci/vvLK8SANAxSTP2ZawWRSuHPnKJCjVdnHKeOaFLoD9tCmHAkX5GBInEQfr59AwgtgMYhDDqn2VzppNoYMoKr1zB+8cPERzaxMHaOJYCleBhLTHiL4vp8GxtEWYR3LyWialRVv2vZLzkIXH4epEnP0+o7EAakLIHY3eB7HgJCXf4ajaXFw8DT38lMAaDals47hT2tCmcpOsCFkrv+eFQVyY2MBm3Ka8ugVXz8OSkiw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0048.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 06:37:07 +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.045; Wed, 2 Aug 2023 06:37:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 08:38:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/KmNPBlVaVdQDhmkzbP91GZ+QfHPkcdZdhLiZZYnkUM=] X-ClientProxiedBy: FR3P281CA0049.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230802063814.22317-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0048:EE_ X-MS-Office365-Filtering-Correlation-Id: e34f58ac-b2cd-438e-bd9c-08db9322e430 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKweTUlmISQeL3+BBxlmv2aXm6qJqo4vOIqkWRrMMI46hrdn2kF3rI3REfMCoH+dKiNtNTN1WaUdoiXSSsQkC3JW7BrWuWBvoGTZRNSOh+gea8zWcHIUV4LaER2Lp4VYLdqyvqeXqNpT3gcRfc0PIvUitcYo7hL7qu8FHFHfxUl/YnGgO/IeWruGiYeNEQczFXCsH/kHUORdsQe2/wyRPd+hVWf6jwt2sUhzqPTj0b4Xo6xdKkxz50M464xqXZth6S1+s1uHFunj4pfwVWOnWSbKyxOazc2tDFkbBrVmby0zvq0Fgp3O0yArUAG7qpJkxT/RPS7N5NZdhzHexF5g0FDf/OHCJzpgwsQwNRhOjusipIbrOheK8Bt2Eh38//hAEuFJGNM5eXBLCWZ2Ug+CngMxqoJEemDxmuXYezgFI2/bqkICC3ukHm9VTM6Y44fserz5YJ2KlAzZvAP1py2xyJi3giFZqhN/o4tCURX7Zl/qtHFbfs7SRUU7PdZWu4DHNlfxPL6EzyPSe9jEfq+/Pc/VeuG9lb4Swcxe+zjOYLPyMJmbipNz2bE4fvp0cwFi3Svo5O/EuhhuAfMGeaURpv81NiVQFtN3G/IQUatyIWpCiSuUmkY6qqvDYGQJR2McDfnxdoY0vljujmzOJdG56qezn4nHM5lq0N/zR8tW644VWecwDXsWO5tBI2Nl7kQ6LAxbrkKvydiBZ62HGEkFUxpEC0FkYZB4onQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZxEaP9lAU314AC/RPd6nCOH97gGvqWWXI8dS5/TBAavDiBREHN5ooFS6AAorxOqa4urgtJCYJecULDZ4R97ZAPw8+rcLJcZENcF7kklpGDH15XzLU/Z8BtFR6U8ItVzjiwhZMR8geTDvS8eOD9zEW909rFDHWFe+NIjz7+2Oei5XwuauI/jBwBYKekIdtg3PIjqRAPq5sdhrq2+Q7kWsSLWk2GrDkc2p4GxTEtqk/vViWsc4j5NW4IQZ1+wmywNdA+u9NMvF+NgPqz17uy3POfRbZz1wkcsdTtti4DAUQCAP8HWEMyiWRao0OvL370jAkMAb8RstRBxkcuCi5TtbQNRuuKct5xy99kYZ0RzcdsN07WiBLQl5upHY//1hYA246ysqVyo6tnIutKIikauLqc2b2vW7yGh4K0/pxrGSsexMdHAnCiBTmxRr9t2Ep6D0Dy8CUhUxaxfXqc3Wrxy//dC7WkK0J1NXU/qlMzUwoFtdUcPBJ/WJBt65pkbcWHfcizRMdW6mdyTv65N+WRqY9mnPtEkiE/Gj/xE0M7SUI3Xk3yZQdlBNJHUbE986o3r66veTG08cdO4wjqR/eskhXv48iNsFo+/Gl2oQrt2r1BtFDchR/Z5y9uDD+LXn7FH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zrCKQB/gCQIea8eel4tkkxx+1Jx3t71aCMl2FHVPnZYzmZGQr9Mq8TKHutZ2YF82DvQJe+X0ppwUg9O95yHPD2p8AOiYDq+zpPBzzllUXIG8lQSRwk0u1hBqtA7zn/Y4GkvX9bjgxlhEiGifkyManUiSWEeJl4jA/lLpkCgYjE7pZN8v24vrSC4TwuVg3BRGWKmoKQOMAhkG1H1LdP70QhKQuLYAKDOaiDFFNlwZcvlDk9Skx34/P5j5LziFFyhFUMLqUwEtl1qLqXpoiKxTUE17fQmtLFqYw2ZbddprJetFNmRhwmxSf0k8rZlvQDJOBj6BIFZzP10TBFO/khqSCv2eid4GNXHfxbbN4jf2sXQpKZAKGRMae8SbhJ8G3fvoPfwe3mrVqmwbb/F2xfLF6F5NbWMP1vbPjBhVRTP4HsnC/V3JhP8vJ1BbU/QF6+Et1i3xmMQaxKUXXOCK6Cgg8wxRGP624o4WKdR0vYgmcTt7ZrqTyHaaYnS4FfdrwiC/tO6OfBOmGqRs0wSPyBL8YzXbVMgp1qDAJiLfXzm1tRRnFngf8RNd3yzXEXQh9difiJt+hjFXEl0DHO+Ybo0A5G/K0kcuiR8bpB2jW99wv1bShz6PEFpFszGuqPSHCqLlsd9FWNiBvEP/tcoHCO1Pj3Hl06eI1Oy4OVn60SZ/QQCcaxr6VejRY3KOBhaKR3FwTS/1re1YdT4NT4t9gwmcT1RONhDm2R8oXk8hpjcMARZimC/1Jn+S0qVFfMEwxqAFv4IJqMfy2qaqgJR5YrSe9I7LFkLypIMHT6m0PkE6Qc4X4eCw5Xo5eN1JAss3HIyMfG5hP/8LpAvyGiS4UfgeU8sFpBTqbvOK3VkRFBodYvaPnLahqaf+Er9scn/Var8ip3wQ/ORVUIly8eyTZwVTCxz2sq7WHKAGKJENuxshfLwwnaymo4oEsBEwipyqpybpJmlJ2F3zez3b4/FoJOg9zuPyP7spQc2dmI2FeBLzKMixD5pGe07yf8wFEa7CqNzRa5KcUBmyvrOrkvfNIGtNseYBDBz1qWrAKbLEGVDT9gkuJmFVs7uDbaxgdnNAmiyqnG6IhRPYdYE4d3U/fvJhC5+lTAtMHwsOOfuKz7MQZSd894kbTnsgvFMPbu/iAbnkdIAy6p3dEao36kJkcnnfMSTeKe2IkCQy6COkCvUPdGG7POqdbTZSZZdMvYiocSinwQzj/RWX9T8wCbQH+6pm5pb7U55JXs4Xt9brp2qVO5y+AQjUqS4D2C8ISzfmUYWR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e34f58ac-b2cd-438e-bd9c-08db9322e430 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 06:37:07.2532 (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: DU2P250MB0048 Subject: [FFmpeg-devel] [PATCH 1/5] 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: nSWW/vbGY2ZG The discrepancy between the actual definition and the declarations in hwaccels.h is actually UB. Signed-off-by: Andreas Rheinhardt --- Resending patches 1-3 because the last patch depends upon it. 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,