From patchwork Tue Feb 1 13:06:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp610878iov; Tue, 1 Feb 2022 05:20:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPTzX56U5AN56lrYe99BfgBuJg8uTXH8Slkfwj+ssJYUi7D89utuS8aWC8tODBV6i0eUuP X-Received: by 2002:a05:6402:74d:: with SMTP id p13mr3760926edy.422.1643721633283; Tue, 01 Feb 2022 05:20:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w13si8408007edx.213.2022.02.01.05.20.32; Tue, 01 Feb 2022 05:20:33 -0800 (PST) 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=StHFM6w4; 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 7B6C568B2C2; Tue, 1 Feb 2022 15:08:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2064.outbound.protection.outlook.com [40.92.91.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 552C468B3BD for ; Tue, 1 Feb 2022 15:08:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G5DjPO6Yo/dMP7GWvuw7/AkJTlPOb4I0VprSxMVKQE0fuVHF1iA0mUKEP1YCV6JRn+09nL4N360/gz/HtpP/JUuJ5m1vdutUwxrMK/4l8QI+Z8zfUdCYgxKCdQ0lPqtsWBrGV5BmRjyW43qi4s6JvC1Q3Vw/LSQ5nQuEQqsUJEMzyGO9XghQh6JnuqBc9rZwcZO68YIe24iB4sfteSuiIhRD3FO94bXwt1lmqXvSms1I2y3MU/pINq5Gg1kafmPXVO3jBZTxVMeov5kd9IjsUnhReEV/PwpoFAfchkMmgBbMrfZXlROQeHtEp3dJWXuHy37hjqy/Izyaa7AiMdM79A== 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=2EK9s26BeSM5FaSeha4KTfCL7A8Es4qrXL4cafBag5w=; b=CT1yLZj6qv3prUO8ELnqMGczZoFPiKZx0YB24shYqtaMwkhvgx+zFvR+E+SpP9sGmQ2taEMO33hfcGZ9c7rnNHdClFZeuBlMUM4pu+yvLZcwzE+5HqSy6okgKLhm5qOn11edUIjk5HZYTih1Aq8NVzRFqYqDD/LpINAXBQk2JPACK1obT13LjRd2re9aqk1rXq/d3bZX/HrIcTmpEsDbtvFg7FX0rIAo06hgyBbezB+AWTMS2l6LRKmH0DTc6lqSUVRbBCp960Bhqw03nja2lX7FcPdLkSDyRMN/ML62zRWS4aXI5JxGR2lT13/EwwyomvdCwhYWWBFzAltoBrAnVQ== 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=2EK9s26BeSM5FaSeha4KTfCL7A8Es4qrXL4cafBag5w=; b=StHFM6w45Du6QSSGCnJ49ltzrmrA0Aqp5AJmAU76IntT4NK54ZsMQzHaGpBizrAP/0RUQGb0rKgdzrMvv6/OFMMzVBJwIOm8VyWYlktbM7jr3cxtlx19q9hoacSUtvPQHl2KgfwMsLgFIORM6yiWmalH3CbVUpoj9Tuz5smT7KSIXswAB8PIBZhVPsK/+I1PGY+2CGiI2hewwS/C/iXXvaeYr4/yuxqiF+u9B3FvoupqUyMDsJ2qBBcebTL94mnk+I952UqKl1qt4Eh2GCzuldMNiz7tRieJVr6cSxc8QLDSlZQk4LnDMdm2D9hpy/y38Mb09VldITOlwVG5KaXmhQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB7962.eurprd03.prod.outlook.com (2603:10a6:20b:439::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:08:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:52 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [eRo++aVSbbvSPrz7GjiyCT4M3eDaEGKv] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-54-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2363c589-68a0-46fd-a17a-08d9e583f729 X-MS-TrafficTypeDiagnostic: AM9PR03MB7962:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pNrnczOR5/2y4f/XXON2oTwps0mGDdrzEKhzBZ2513cLQAxzUkcIOn1Xq5e/O3Ae8PJ4zAloJIdy12YROqsog+8cITwvRXXjY7OZAqmpUfDjvimpo10rStZdY0VPbeY9VnGITGkGUTUbtj7h0Ue7d0h5/ginnQtyCTcYV4wFwWJyXBQ2ZcQPesWfQnQOLO2dxwws3NHkMkcoRJKNp0cEe+OwCt6dLXYdld96kfMz68oxHKxrErQe4LieLPQXAtwLB15aoWyJtxjcnC7GjGVV43/SQRrzU9Kl5DJwhUXZUTKHisFudxTwCaP/RMrFC8b8DRmRkVSDJxWivNaf/zKjHti38RZLSDqrra9pj1L44M7x8N3tily3hLqYMIIP4T7rO9FsYO4XNcxsc5Us8UU/4sv4ND91hGJOqY4T1irX51RcG/GH1uesSsvDKudDy3sTz/z//LuLKyEboFaRk2FhfxRPDinwCkOWGlQ7gSMgerEaOmaUosm8Lboy85z4kxm8FFjvL+wUXz8j1g8TLpacCC1RC9xM2jGt04j8DZtfgRWzVjIHqZPeoo9YRMaAPveK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +Y21dcU4AGsMYdH1+Lrffj0Mue0jSy42VFMC0b4VJsiuCKFXuYNr5SLAzr9Y1MmlSd6O6gsHhb6COR0ZwPZJuWPH+BU3TLUlUSGPobcPPPDTJklDO+wW6aCOm5IbRiSxUs//AvZwXs3jfFhumd90OITQ/SNgvtg95LzEBVT4kvWTkdmN0wKs7oMBsz7R/Dn0V9RAE0WuGpoNY5egyxBmYtARWB1tpC9BCEKZGYnsQBeK1G2KkbKXNDAtC1evmnXSc+YKh6Hf6KoalD2ZsbREkDbfgHn2/XcQA8tkQF3Y4GufUz6rCVLZVnjHxjdXXVgmOD3Ciekm9/MvonDo60KZcc/Z7NsBAFuF3dcwLiRJrpPCtW4kWEwI5/868txKxD2l4ZCladOjWC7Wklfilf6z94wvy/jd2CjWuLC1da5wDE2DZCigmqYe1GyZxe59yfkRjUSeql25APTdq3Hy4GBWje7FeAHKftk6+H1bSexS3wvR/NPZo7NZAyGVgz/Jz2aXjX0j+VhzOvETxllr5zHCwXKOljiBoRj9LNRs/TJYualX/GR0kPemIOw1D07TdiDXa5PwZ8wsT14MjzuEnC+W9/O88J3nbTgBTPbuC8+8seVleoamPVj+vUdXCj5Vk0tTjYt8JEkAFrPvAznlL96LBNVwXaXPJUVmhng6Ey952EKHDkUh2+mEO3vbyRXSA6lTHR2wVtJWMIx9OQRlUGHn3PnKHXZfWfsp/8Ci/wF8OsJNyIH5PfGybSanEuZPsXHhaHxWWPWfTW9AYe6GDHzJHgyYLme6LEli7GaxerRfC1YjqjgvvtgHBUWSETAuHJ8t7iINi1t0ORJ2XMoOzJxcz79ELEf63jf3j0mJ2T9w0WghgDlD5w1WW0A0U+vYKIBZLukKPqqw8UFMMiBCAI5JzcAoFSDtDG3mnkbYkMuwED0e8ce0oIniuz0ynLRkrAeMC2Eq8wl6Qw7pglD5mrfnWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2363c589-68a0-46fd-a17a-08d9e583f729 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:40.1062 (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: AM9PR03MB7962 Subject: [FFmpeg-devel] [PATCH v2 55/69] avcodec/mpegvideo: Constify src of ff_update_duplicate_context() 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: tTXTUqFQn/sw Also do the same for update_duplicate_context_after_me() in mpegvideo_enc.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 2 +- libavcodec/mpegvideo.h | 2 +- libavcodec/mpegvideo_enc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5a68a7cf07..b71e12c3d9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -469,7 +469,7 @@ static void backup_duplicate_context(MPVContext *bak, MPVContext *src) #undef COPY } -int ff_update_duplicate_context(MPVContext *dst, MPVContext *src) +int ff_update_duplicate_context(MPVContext *dst, const MPVContext *src) { MPVContext bak; int i, ret; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index a379f65143..cb947ff56b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -545,7 +545,7 @@ void ff_mpv_reconstruct_mb(MPVContext *s, int16_t block[12][64]); void ff_clean_intra_table_entries(MPVContext *s); -int ff_update_duplicate_context(MPVContext *dst, MPVContext *src); +int ff_update_duplicate_context(MPVContext *dst, const MPVContext *src); void ff_set_qscale(MPVContext *s, int qscale); void ff_mpv_idct_init(MPVContext *s); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4dafc68cdd..6c40bdb39e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -252,7 +252,7 @@ void ff_init_qscale_tab(MPVMainEncContext *m) } static void update_duplicate_context_after_me(MPVEncContext *dst, - MPVEncContext *src) + const MPVEncContext *src) { #define COPY(a) dst->a= src->a COPY(pict_type);