From patchwork Mon Apr 29 21:14:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2273074pzb; Mon, 29 Apr 2024 14:21:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXeKsCpl9UAyWuzR5kbgiX9OW+3ILu9ZLqa1E6dMUnggTSsCzJAoMIMz+EauaISxmiNj7KPS9UwZWNajT1ufbA/hgCG0MUNW/Usog== X-Google-Smtp-Source: AGHT+IH1nLYoNiUCQumhi9tTS+YonKRNO6Bre2d6Yp+OV1bY+BolMN0oLcyoTu8JathO09LPjWUI X-Received: by 2002:a05:6402:50c9:b0:572:6ab3:39ee with SMTP id h9-20020a05640250c900b005726ab339eemr6270739edb.29.1714425666868; Mon, 29 Apr 2024 14:21:06 -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 n28-20020a5099dc000000b0057279584cd6si2445749edb.224.2024.04.29.14.21.06; Mon, 29 Apr 2024 14:21:06 -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=b3MeswbN; 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 67FFE68D636; Tue, 30 Apr 2024 00:18:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2054.outbound.protection.outlook.com [40.92.91.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8D9868D636 for ; Tue, 30 Apr 2024 00:18:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V/smmxF9m8iqdIcf+I5me6Z0kqjtdJ4NAEOs3wZP8Rh/5SrUkg3UWppS7qzNcP4UAkFJUbnjoWu20IZf1zC61Z2OkHXNBBJeqa7IOR47qvHlb9gK0fn7Wc1kQ6Bacp325tmemfTLd/G2KFKrzeYSkxtLRsajLTnrIk2DxTyj+vwy0w8u960b5kLyGprphPFGQIGYD+9SuuStziuOTRnLm2jXOb7KpgpcNWXwBUAdToVhj8wYM826qDFMuh9wblK+4v0lgQT5DnFknsz/p6b+TZUr6NPpdFz2SiiL/RCElOtFbuE3ww51/CBiAorCZEPx2V87S+KZwKVQ/xkbO4I7Tg== 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=YEnensl/ZX8Dl2y7vsKnPGU3f+BVqGEMoIgjql0xz+A=; b=VDuw5fqJ/vwBUR4hmF41jMk7pLR2buOpcGMr4fGr1ffopcSLOquCZZIGfJEYu9Ud1aw+TTvCu8RyW2WUMsdR2pMqEBoiRflL46gtgQ6z5Yyo5ZV/htBRT8nflq5x4bxooECKszwotNPp02HZUfUoHAn13aJ82cr8iXq5ytULSo0cTDb7BDwV3Dyt96NzETW2e3MRS0eclXifMQPydlKVJYvDyPBvPfJHm7eSMdgQa9+7JvwnpXkjs0KGW442irFyLtQmhxYAHKtMBOGYpysFb5YQE9OlI4SUoh9Vv7DuGZ92of6R+nl0MQ7z6l0hOUqCp5Fx+Qs6hqaK1E6XdiHxzA== 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=YEnensl/ZX8Dl2y7vsKnPGU3f+BVqGEMoIgjql0xz+A=; b=b3MeswbNgM0D9qJ3UD+Hb1u9B6MdefjP/RSRhjsNWQI/yTo6X+SviAIqTr3TIUCKs8b2+dMsPNvPSi+SuTm+0CIhdeX1gsB39/yCDqS1jqpUWpYV1GmJ8qjDmAuLY+DzgKlbmRjrAYIpR2MBWWgwtsjnaoMNj7Bw3rtT0EwRoclgjYNqcuWlmSW9IbZwSIWnzLImgelw+WO25UbANjjjJ9qKfvYuIbnT6VMA+UpLvfRKXsVSSEHUG0NHa+KlObBfyEGgtshnORRD8K1FPRCTEi1tgj6SYyqpcpmkoN7Sl+y3ogtsLu+Ge6rpS4suQKnOwoZK6hUGor//sXk3ADtqYA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0616.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:297::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:18:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:18:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [cNF7Xc8tS15+cQXfoy+e7rAYtRZB48G/d9TYptGqd8g=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-39-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0616:EE_ X-MS-Office365-Filtering-Correlation-Id: 07d090fd-a528-4e2c-641a-08dc6891e498 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: jioIjins+hgYvQlcSBfK6xnlJlLggDxkadPMcRjeDxLT6FIwvuIYs4CwYEZodLm3tG74OXKYQZBcJyY91Sc4cNSHmI9FKVMXhm0B0d+IlrnjKSUsSc4Nq+I7p2qQ079XcAWFfuONg4emmMl99hm5xNnmgOXY872LJJJAsKaqID+5ajZlMOfnjJj8Ed/F6sIFvO4dWlq8j1mFUg8ya5J2bHrDJsN9TbpYM4FtR5yghtlDDSIgMRCt3uThebtwLr6mLGxrzzB/KS6nDstvqloLRllcC9fE9GFaaqMrwX+ILIjDQgALYlKQVHfKoRm+gw3U8CxnvZiClDr9+2HfAtjgYDYiOl+xqjfIGJ15xv1I6xfawkT4bayll893SjjsZTQCsDatEqIAfsbf2FMRosl0ACwyi9Cxnp0rPzVv6eOWBqDyknHTJdmS7crqx+saU6Zn34KmID7YqIxt4ud60uDaYxFH7NNCjTB00585XW/TDMRNQo94xqisX0bMTbU+y+Csy9Gvu2IMKxf8DU3bfcEqVT5munsGeEEnJuISxPg9lnX5h6PGsUCRwarr5a37Np5jpBUVWvv4z97SbNeA6YenDnuGMdpj0vSEsL07bpBb8dd7YWb8duVKmr+zoLng9QAs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: luuTlWU/X6PTBwpq8qdFsTSeHcu6UQLv1Q0NvOgnSGw6IzZlTJgfVgqtdi6nD2CDuFWBKweFhTA04AQ8kZYCISO4vpFgx4OLSRUxBlaexbH31PYayN42XRcUqQHUolM2wNYUPIem88eq+xaB56xLYqwHDQS1COKJ2ebOrff0tSI+yYAQrTvEly+TE5FrjCph7rGb7+SM3XOIfn58VYQTtp/T+pb6BtDVfHNgQ5xXrU2tYdcCctmNdW9vEe0sLnL+IinJsXwGb3TIyDXcn7UE/SEL4/ei5LYH0feea70wL2d8uRq1maRFmicxUIDhzDyuOWWdS49gfhX3OocWAIJqGO7JBtqpNz+K/ksqQsBaLMaWwATIElBTAu8F45TSeLUpCXoB2n0XeO7vi4oHTwLvqbTKJC8aG6cmJrDlFcvUskp2EcTBJvgepx8dShadtXlNe+Yue+0+TqYdlpQSGSjmQOcjCBKXuLRXBk1F3+lT5sZOa1pBjyvz3NFFusQZEFruK2siJnZ5eP5PXl9TrNlxVp74ZuKDL5U5WEpgFUMe6sjSP8haQv6WNTS5ypE8DhE5Dc4HfmmGhZQxdcI67qfiWaXHjFkH2NgjC3P/a+bSDcMEkDkPPzd6/AjU1CB8hpCXdVxIcfAn1RkHv8rRO0xmWZSuAy2bcX0h4PHWiyWb0i1StWrxOLtu6PeJcs9y+A2aw1cuZ+ZnaMo54xoBe2Y/IBeEsoW6TybO5iRH266VAOacdBX64Xjqn39Ao0jXimQt2zlnEqGeaFumOJ/P20uZpbAJ/TnW/9xMO0+Id9Uwdldq1r6MsezIk6YyKmHJOaZ5mS0xBXu3cBXw9rv9gnPDmRTV0XJ0O0KCtpeppXbRQRE9OQrhpTGjWQJehtlIYyiOJz0evsQEllvbjphNVWR0YlhadUvKCPuPSG40Y3RJ1iKIu3ojQ/gq7/Wv/SGaf49KDoaJ0wmrfK5xyON8rxtDNZOcErLsosMoXYdjg7Y2KIzE8tFUlCQZQVVo1OYm6cEPp/uPGdtDLkYfLnRRWFJtcY16iRoqt6ACS8BNNylqAkb/egb9ajuN59nNC4EemCcka9QXkqOamTDYszmVWnZhZabxD9Oj9KDp8HcXLCsfOsRUwoU7vjCUC6e9/wu+9TdZL98EQfdAlAqiYQQXeVWfJiN/4MRJRQJ1nD919BX+5dcGo3uotO8Z0iSqgFluqVnom5EPnbXB5om7XKrGF8KYqp072BH2v8HfDdczmsu+y4UJYqwPW6K0UQAc9doKVEvYBTuzxruVRMU3rY5GRwSRiQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07d090fd-a528-4e2c-641a-08dc6891e498 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:18:19.6695 (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: PRAP250MB0616 Subject: [FFmpeg-devel] [PATCH 53/57] avcodec/mpeg12dec: Pass Mpeg1Context* in mpeg_field_start() 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: GZUT6Z/f9PHo Avoids a cast. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 0d5540fd2f..52f98986f6 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1278,10 +1278,10 @@ static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1) return 0; } -static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) +static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) { + MpegEncContext *s = &s1->mpeg_enc_ctx; AVCodecContext *avctx = s->avctx; - Mpeg1Context *s1 = (Mpeg1Context *) s; int ret; if (!(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS)) { @@ -2460,7 +2460,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, if (s->first_slice) { skip_frame = 0; s->first_slice = 0; - if ((ret = mpeg_field_start(s2, buf, buf_size)) < 0) + if ((ret = mpeg_field_start(s, buf, buf_size)) < 0) return ret; } if (!s2->cur_pic.ptr) {