Message ID | GV1P250MB0737F0FC82DE9C723F67EC8E8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp300328pzb; Sat, 11 May 2024 14:01:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVoH27vDA9ZhdcMX9BKprYKiCauzSURj8veq10rEABS0X8WgjJBuh9GdwGrdwX6VDSQ/rfb8YD0UFMoFqfHzY874wnVZNec+qeZ2A== X-Google-Smtp-Source: AGHT+IG57rltWZdXpCEwTvlpJFqzdRhG0ssSHwLqmQINMrB1ZLQB4h8y5h6lP7guPBmuwWHRzzPE X-Received: by 2002:a17:906:1992:b0:a59:b359:3e14 with SMTP id a640c23a62f3a-a5a2d5356d3mr401261366b.10.1715461276518; Sat, 11 May 2024 14:01:16 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17c2c830si315747766b.971.2024.05.11.14.01.16; Sat, 11 May 2024 14:01:16 -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=N8RMlmOR; 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 8F63368D834; Sat, 11 May 2024 23:56:05 +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-vi1eur05olkn2011.outbound.protection.outlook.com [40.92.90.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57B8D68D835 for <ffmpeg-devel@ffmpeg.org>; Sat, 11 May 2024 23:56:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UVfsy9acxScVY4m2z5CjLuaoZaKlzfrsT1SaQqK4yfCA/TfdIobx/BI687Isseov9GnMw2ESTYp5yhk1Zz0uq3SQA3Z49+HbkmkGVK43R1/AgfM3a/UdB0FnMr/ZUbbXbe3CLS4Wh5AqAr8Hbg0JipYiGHIFd7CFh5/380chy1JlFMWc+kr2y22r3RNQAyGUpX6hPfDUYTGw5vA0olHzXudZMbt5oL4ggRW0xzlG2XjpI/gkQhjJbzIkhjW0A7FqOvTuTMC4wq5vSqxZBhcsdFxWjgP4/yIyYzZDPektRbu28unvHKdBHMy83auLmOuJnVMJEB3cTFoPtfZiG0+HoA== 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=cypwJu5lEtz2K8A3cpd5Vp5erYme2/eNcUAdedqVX+BsKoSJUrVbGhRAsvSh4WOSPozhu3jqFAXEIyQyyl9hU+V4E1HU0FFTxPWeltsXrNzaCPILuAldg/42t1T9b/WBJINGj/B3da3soQrPrjltlWjE7iLimN3qektyGFreL7AeioisyZfQijv1SxrRt6tNT2lh/Lf0nyZEUz+/uxb15lQnEEvih0x+3NpuNfUuSQHHyznoC37hQyVWQ3NJlxuDUce5rI/mHgK5yp1z75i4sfs4rZvJPFCqHx5F6eNkShdF3tgWmlynlJjAktDhGdhoqPyOSTq8yQwz5vXIchEqmw== 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=N8RMlmORXfVBeriIYt1moh+TsDjIxfZWoimjnWK0SWVexZMtGRm61YFyTQw9qSvvmB7F7UCyd9cAm8tb+cW7MAlrFCo6i8LX20FBrdHlj2cWeWsefYKL7tPcdkMapWuqf+hYiZQIvi+QabYXNi/HyS01rXUyX+evI3aNX+/tHEEMDhQEDC5awa6mZRzKfgD3tgP/bU9vJXO3L3/buxB4rYVIdBjAY1m+QNg59e/IpKrcBBZ+XE4NW+CrfzExFiQlCcnKMTXXwUhIGFMJ0NK7cMcVQ+uX/OhZxEfO32uayi9ZxrxpQk4A6CNwAK9SQJcwsxB1OrnYrKZQUPm084YtTg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:56:00 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:56:00 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:29 +0200 Message-ID: <GV1P250MB0737F0FC82DE9C723F67EC8E8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [x7EOUWpOZ2xJAgq9O1XTnTcvfOQ9KjGznhlm7a3zoOI=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-64-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b04f690-16ef-4fe9-5a65-08dc71fcc372 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: AhX8+VExKUkSEU1CBg+v6udKVFGn0wfh8yqjrUavEasT6G9bPkm6u90oRN33YepeWGNVK/CFAq5THlHzG52XPbYfmtu4FunForer97kw23qz1q/Gppa9kAu8Vqm/tAQ+RJjtFS/5kM/cB8P+0G+xnGzgdEoXvxiC756XPeigaqD8064ComFNeZNweiCHoANO0Oa7H/m6ZRepjZU5unFQrNN90uMoDZeSgKCXR5Hwz4eGx4aDkWgkU+GVK3RmY+TVmgW16Qz89fqtEaVE0j+D8J4s8Ng0WonLkTzukdHNkOMUSG0+toimg7SoBveDCTP01HND/Z9MGRaySzpYVtWSKDrmuAJOYlw8lZ7n836CRJRoKkjl0TpjHK1LavYvidOXu3NEJzaIs4L3Pnumsvt0wAHlSa2AkDsHl/E9azBJB4yGbfm2/tju+Yu/Av2kEkAa/dR3gcNmCNvnWVNtym7mjqdavHRD4YG2EOuwqXk0tdwpovIX3mqGQeU5Cv4q8de4U74bY6okX+aHul2RfZzd6r3WNJtwDJEwH3EM19oTFRhjItzHhqbSBhSoiQorSho3q4mnWu02kUwSqTPwNVdIEe2QPoZz9wb8Lw/Z6jcoCCxnYBGofJmpbrLp+NUcgd4s X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6UCfL4JWbgj23wu02lzZFi6abVjxm5ELyDawV4fVD5pYDsJBLD+xCTANTIDiXaWqgIrQYRj2bsKhbnKtAbHsXWtEe7KKuiizRFrLZ2i3IvBABYoA3z4HKBbQpB3qJMybaf7EU20qF1j1yquD27cBFZWIsD/p0fPQOqCyBDpo4uPmwVWd4y1jUBVVfpHXKO3kPNTmKUL0/+qntXnCW8Je10mqPFtnGmukeM/2ZCovCm3iQYw8EOLYg+E0O4KGcfxYFiQC//xDHCG3v7/FLpqtmmwjCnmcMQgkEFcGWKqaj1FkhToXkyfkoqG81NZHEOVHTihCz/KQHwYbTFTfQZR0dbBDBMx9zkiZGIeAgrQYfyeXbO5HyLOJHMOXepYR0ZQktBE9w5oCuCUoJvsOnAXKAZuzD5Df8DOSwWZcxhKSDNler/LZFMHy02gN1gaShZK+u42yvW0nXoIZ0MdveGfe6aB/a0H6T7RlLnK2pyfUwzSAGx05NruoN0lKps9EeD5lyXI+U8foeiz1Vruf6DrlXdk7FJdBRZPFRfd3Bze98JDqdjDvib0m6kiTJYd4Dv3Fnyj8Me0YsFGGtEnN4Kdx7lyF8ICpaLPdE5HbFYte595iaoACpGg7fsjbGiJaNEPnO3F1eyuWoLIUuFFxqm2SBGE+dIua/6g4foXCQJGMMfygo1FLdpaLp9N+xA5Qq6Y58kdmnjtD7wusVOOn1RfZJ1OYEcHASQeCpxgpLV7qn6boJgWCCJnKCnJKpPgqI8VIBSwzssLMgTeXb1baM96y7iy5Ku1MPjRdMQXvQKbgS4THjL7sSOcjRkynmIuGQKnm1yZzY5D3yiV+Ka6piqt90ePOyDCKMNSZ+q767YMKL1xLXf8ZLxNkz9o1k0+NA8AFAKGsU+IUcFnyGxastux+hkxoVSQHEw25eFkgAwyln7jGD15kxrstNvRb5Q3dsm4XeVd1y6/2tTvqYqN/kRxOC0GdxBxzcKBamLue+IJ2+cDw5iERAGNxZaQIS2+L6Vmw85VG9SgexaxtO4RC/sJUC+APn6S+FWRcrfHLJNST6CVY1qlHxjOGikGwo7jHlNxipkabtHy2ULDBkkM46zyXQh77V3GX7yUpRn+D+fjo19RaqxibWa84v3QC5MmFzUPNYQExZCEvB2moYn9b+cz7baf+5p0pck5vVCDOoj/Lst2TU86D93xFB3PMZC9ZnEPEJdwVPby/K3u/Dy4YIo7xIyc0jrMKTEVymLQns+rt1B9wOtf7Q7khRZq4Q79LyOEZ/zFx3KcWBBaqbG2T+CYFsg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b04f690-16ef-4fe9-5a65-08dc71fcc372 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:56:00.7631 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 65/71] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: kUCWOhbn6o0n |
Series |
[FFmpeg-devel,v2,01/71] avcodec/ratecontrol: Fix double free on error
|
expand
|
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) {
Avoids a cast. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpeg12dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)