Message ID | GV1P250MB07370559B789343F91301AFC8FE02@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 nv6csp300266pzb; Sat, 11 May 2024 14:01:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUrP9KKqTXSTBQVVh4QcHYpRt38SZSDvLYPvjBfhAdOg6pNqpPWjSD6+F9asO6dVPbM/8M743CM7waOPi5E9aYu1nwZZaGQPg7vqQ== X-Google-Smtp-Source: AGHT+IH11nbn1/kbdH1fI+BoewSHM2hbKnDUpS6CyAnDQqb7slZIETUEmqOEpPmrYvpov9gEsL0m X-Received: by 2002:a17:906:da8d:b0:a5a:7a1:5da3 with SMTP id a640c23a62f3a-a5a2d09e4b4mr591245466b.0.1715461268292; Sat, 11 May 2024 14:01:08 -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-a5a17946443si333114066b.148.2024.05.11.14.01.07; Sat, 11 May 2024 14:01:08 -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=XLhmtWeL; 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 7C00068D833; Sat, 11 May 2024 23:56:01 +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-vi1eur05olkn2104.outbound.protection.outlook.com [40.92.90.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55B7A68D827 for <ffmpeg-devel@ffmpeg.org>; Sat, 11 May 2024 23:56:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iZcbAJffZm0cSAX5IYNWIoEYVWxPsKvmHFluP1gsYVJPttwxAm0IFRxGcYckYhQrFXUa9wp7fJRdl1i0GSVjmJ9WTYMzRKgVy2cmCZa2hL9Q5SRMl6KpNEQDm5VBd7RKd1I49MCPnpeX7i8XP29Fa7lXGXuoBS2b18a5ugPN+6bFQKjnD2IzO2CJIRp2U3n7nYZ+XveimxXaSYmZJBVQEg1oCJ+9ebGDPaeGD9tcpb3dqDAq9ylht7+sDSqOEdyLmwTlkMSgikxxC++oMo1w9ZTs0MLtxgAPDrWuGrRiWqUM9SeFAUCzHkQymvk84cvLnZR8CdVUaLRXWyVBMEfQzg== 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=/+qBN5ra/56BGcDMsiG2oJKR+/UxNu7IOsWniDnWO98=; b=TyPRwZosgfjbHpGVcJMnar/f3+ltxggN7lCcKHSoKKjalU1RJRHjybYWiEuMOwPGxfqwt/wHqnhDTsA51wmo08i8jG+XHl+NP+9BqWAEb6ZTuDZ7ZtGMhy0LtWdYMkhGeZPwM1/eECJMNkbc/3APOluX295qAEO6N36liGB1Dq+bi6wvo+eFxhbhVa6ryn2e3YI7qe7W3cXgEkN5b/9IOsNxdmfxhyoGJYw8D8uT5gLjVZBZl8HY8K467IjJQ3jkbWSZpi4gzWgvtU7BFxTwiRDleU5yVwGgM6NViTi9P9QJk50Lmc4JPJEDPER94kU94R3IlCmu3LgqQVOofjXSGA== 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=/+qBN5ra/56BGcDMsiG2oJKR+/UxNu7IOsWniDnWO98=; b=XLhmtWeL7efB2JL/h5T4P26gjVXAIo2TfTWaIOvtnsl8W91sH+wB2MW3yopLLe9gzc0lgwXe6AUbzIIr7ae5ze2MA95tjMicPqDB7WkMmPRpMGpxzNPmCspq88QHT8JKP/UrEdos2rt5bXLX3j3NJIiInHgCB8T25BxXBUT1RnNUKrFA/XVGC5ubMXmQmvPColUnOnj5BwovKzVNO27KyVN6EYQR/rv8j4VhSYRIC6g8+P8tbxwyl23kH2HD4l3i20/UDQmLd/5ftabVmKhPyupbC7BMzyBk/NhNJWbWrof8Z+8DF/paR3mo69mtXwqUsTCyMBhvdLaJeRinpSAdsQ== 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:55:58 +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:55:58 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:28 +0200 Message-ID: <GV1P250MB07370559B789343F91301AFC8FE02@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: [2FEXDFcSTtvejyGuUXnifvtqQDGzvPOg2X91LWcRibY=] 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-63-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: 8781a2c8-aef4-43aa-6b0a-08dc71fcc246 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: TxcpMKaNupMe1ScMCXpMVZmdykEIX0d5Kwop6Nl5SOFhiFnoZVYOStfWaLDfmjGKfdqGf+sPthMvizwn+5bKH3211T4ctH/56DtlFji/SUZhM6lWy9V6yU5gHfXKYruyUDTdlqpOCdsDkSyb+YXsXbry/12ULMNn8RD2wSFAp6WRzwfRD5jPamumnrV6UCn9S55EBPvjazFtvfdn1t1Yz9+aVbFnko8e/xs0l5f2WgtaRT6WggF27jQUd233l1stli7tYx3+ZFdqWGBxpWcn0PT0jOoBiH2PquvnwVtKfQwuvzuGOI9Uqe5NImGwBpIuT14Mrh77xAw7i8RojTlloj+GYxdOgnpaWnwieNHcejACEcuYuJunb7aMIb+LvXzDlkkpOvKADRyLIbnFBvq1SQh/VqC9g+nMwcaOyuaKw2Xl6u0JadnQhHDCjCEjEjQG5LEJAW0OBgGU6qbC50juU+SW3LJSHp701/qvgSLrJfiHyI3K0z3mJBrMsj/ypy4PnKhDt5ufqkzfPTQ94tV09MmwaOm4XFYISIa6Slo610e4tB7eLBZbr4u+qwL9hJ+cYyAi32e+fQkGh/TA0Vm7v7PR0H7p9fmhA+EmTuRhAVMI8pjNwzPZa+/u01s9jHSD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7RFmMkerqSCTpOz95TyrxcD4oRsbkatnRtIYR/5+Fl+eEeS/Ztqm2xENx/sc4tDzvBbsachLwC0JFquJuxNtiuL9U/RCxS+/sPWyqlYvng7MWSNlppfA6/CSU+v5IwWT4wTabT75UtF31wLoMCyvO9cr4sjHDeHcHuvZzAH3wN4qCqMt+X3hxw5tpbC9JHRhGfNS7iWMqlv0uLAh3GI3yBwhovCkQFVyybX9hcgMIlNnK6H1jRHppiG8BUzKRgyYfAvNh+Vn26bDAzkO+TEjWNhXOdZlgwpCU5J0juDfRnwD11YWE8WDbvFkUAK4R6Mx/6R7uCf3GrFTRdXjZoO/BAGJdwzOgzePuKjRz7KGrRWqpQm609YkEtyHpWH7V9NifAMLE+fxlb100MjH3Ve6fjOsSKI54TxCAQoMLOgVc8r9pduYo8CjFni2W4/DasHiEy/1ZXKvdCwj4EYAsNQp83yNA2MExFcmpOOAsV9alX9EdL/QL6BxqyupYmv6tjyrxgWd6aHXfFeSQ/omD2eu/rtEcN1K/rNtC5i517WAd2gO0M0athPgwju/I05fEeSReQCbSS0jmsIEzAmksAy9Hrhj1e47j6ZMZU/5WU2oWgz052RDISZ8xrLaYlDyEveWxpDSCHDoMSSRQGv5XkWoGFi5PtI6nV1Tyj0nzTALqq1zENPNnZ9C0nU8Xkx3vD0AQ+zM9iFH3A0Fvq5DvG4SewfsujwYxTFgaz63FI9ApEmLqRk5dMxu/U+jF+W/F3HZG+IpbNrDiS3C0/AW+SNWgZFmfTsQCDcGPUa0SIiqUDC4a4tNr3rvnZKZy2P6pPxiztqzfl5rTOCpw+0f336e1v8Fd9OrMbLMnPf501XdFaGYnGF1Bc+wo33hsZ9deunREisO0pb6Q3HWQ7t8ImWtvcdmXQoB9O/Gf+EKIj8yu3VZYjeH4pWpTMluJ7IC9rfV8OBLxbQgon3LtmCMonkLAvAwI0MzJBqdnObcgfU0+6F0vzyOiPnt6AFocBKEVG6ZuLxjSStJHlNZoKyJrl5pHxsNdqr5MYUq6gJG3CKNBWHfe2UALFLpnubnm4KdW09GX0WAHesh3cCVTESkAd1z0jueQ/m0L+AZ9Se5w09fOU/vlKqpr+TV4HQpTYkX16oIRzISys/PhiAKJshl2in+xhASHgYTy/BTuKgfx2E8/IOD1irpYzJMR+etubvvap08oIm2OPl5Rtl1HfmtLVp6CDjmdAkDpuq156YZrYDOGqUmxb1yV10wVFHVki1T/gUhmLGO86SP0NZSCxUOAkSrDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8781a2c8-aef4-43aa-6b0a-08dc71fcc246 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:55:58.7921 (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 64/71] avcodec/mpegvideo_dec: Don't sync encoder-only coded_picture_number 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: 2kQDZgcVvcLz |
Series |
[FFmpeg-devel,v2,01/71] avcodec/ratecontrol: Fix double free on error
|
expand
|
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 93df8a315d..8a8ff2fbd9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -520,7 +520,6 @@ void ff_mpv_common_defaults(MpegEncContext *s) s->progressive_sequence = 1; s->picture_structure = PICT_FRAME; - s->coded_picture_number = 0; s->picture_number = 0; s->f_code = 1; diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index f840dc9ffc..0a50cfac5b 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -114,7 +114,6 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, s->quarter_sample = s1->quarter_sample; - s->coded_picture_number = s1->coded_picture_number; s->picture_number = s1->picture_number; ff_mpv_replace_picture(&s->cur_pic, &s1->cur_pic);
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegvideo.c | 1 - libavcodec/mpegvideo_dec.c | 1 - 2 files changed, 2 deletions(-)