From patchwork Thu Dec 23 09:13:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7105960iog; Thu, 23 Dec 2021 01:14:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXoTT48g/Q1tHACxhWQUov0LNV0v4eWvsvrl/vT8tQqZnNGlEH0oClM9I/Dbi0IXmpZUw0 X-Received: by 2002:a17:906:6848:: with SMTP id a8mr1156580ejs.40.1640250895071; Thu, 23 Dec 2021 01:14:55 -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 ga36si1973979ejc.403.2021.12.23.01.14.54; Thu, 23 Dec 2021 01:14:55 -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=M35Fq4Yg; 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 5C42968B160; Thu, 23 Dec 2021 11:14:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A93E68B165 for ; Thu, 23 Dec 2021 11:14:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dc2NJRj8dl1tefqpqzAugz75XKUaxWEBSnIRVEGJZHxJG1i102RwvyR+eEXvQZzUla2un3IwcdnLEHesWahX9pCES515jk6NNiUgpzrFo6XTcdhOBvCM79hUKibGUHysj+WHlE1v+fiNzq/pyEU/nS1qQ0soMauIr+KMbQ9LEGNsmPMJDnFn3ldilJGZ51jNLk4hoRlWyK3JT38XtZFW/2OROxmAn4sDBKRkUlbCWV1wQxsPMu3WcOc4xb8QEinz0TKakLXZC21vAMQfCww4igx+13EUam9DxSajVVi0KhRw5Sy8u9iYE0XhAU9vJ/ZK1Am/6PMYt1+OWyl9P9jPJA== 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=udCYXXMK+5xTMgVt3hCPJ3Vc/46zUnhtb4Dg+aWg4Ts=; b=Q7xZmyU/OeZZ65NSDBY4At29/CHXnTOKJl8wiSZtlFZSolMX3hOgWXknn+ZqeXJSvV/Bll7BVMVnNydImbbny09SOYxdYPDg6E8ZvNMaY35MtV/5nwz7PY6NWtDUuYL3tzaAT/fnzCMomwz2cpkdb69OAhimUpfzyaKeBH0pvPXW8AkLVXyj+Pvd+51c0UL/xbVXCiPNGRL47NvHwURGRHi3iquYcIgvzVFA8ycRVTl2Da+9vIuQSUafoauqPQPKl3BE20d2ysm4enHqCsxuftZFnw+iarbf2gRzGh/M0IRPqvyvNZcdrv+F+xqX19uxIJV0qENrGDnpITiuwD/qXA== 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=udCYXXMK+5xTMgVt3hCPJ3Vc/46zUnhtb4Dg+aWg4Ts=; b=M35Fq4YgrvKXKUbnSbNH7sbKKom9N4YCCxSjWr/nqqXDj8QEx1I/VTVJZEMb3K4YZB9IJzzHquGLOEp/jXlKItcEnVNBHVcWo4HIZfnl1Ud4fPsds1SSH8O8javrdR0WyKHxy2B01hCjcyh0nSGSiSE/fnp3V5AYCfIwaOe3VtgM3+arjSrfrhKMWoskrh2dsXQvk6hJsgJnj1xfhE4lhwFHQCmRLo1oy2B96CDISFIGM6PN/GYwBZmnRYdmxfKHX8AoWGQzs0tQxj9pgmOTyhCFCFussrz38UzGx3gDY5W0FwQC5qrFOEnZJjZmLcWHQtNFToGNDoBz+H2TccAO0w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [seUm9sM2FZd3v5e2fW89cS3SNORTbY/X] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9707ebb-c059-4df3-0489-08d9c5f490e3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JEo53u1YRsu4CX+hgtCvdIQ5IwugRWmYj0Ufu1G6jHKvpqnBxtejnBYX16H9Okskzu7nkAzfTfQ3a0HU6DWiwRJ5gsE6tKhSPYTZ3aYH/mlN6Ih7oUdjvOXUWrChJCSo5Dl+Svcu53slDNA26e885g38VYSS9D0fzXHnfQBgU//Jebdbnotqr1iBxcu8jjFJQWdX0EKbiVh65YULXra7ATfIVeodSrHppi5yG5/3rQGpo0EvRtn5M1ISkx95A/k21gjIYPyXmuCk6YAXMUgOZnvw7z6KzmswNlRvRjOBUN706wvnoTFplXtSBUbj6nqhz3UUbEC1UujS0n+wYSDhoPdbT93Us+mcEESPrg6KxVTpDfsLXhhFAokBxHBEItpHo9xZc6P+3qluaYLk7z5mQnbWizxL9kQG5lV5JzqwyClAAb0N6Z5brM1kaq/Pe0UwJsUz2qVgyX8UFTcX+WVPS5YvqE3aHPeHQJBEob+6Fwzf08biUM4lY4YZfktUwmyf9MqY93e0oorav2OFHC7r69IYuE2/CcAPQLtHwyfATosd2XXznmid8x9RZK+2k8Wd1D7hEaU5+4Vi2YQwZcwEBH/1t4VgJXTDOzsKYcVli1qOB3rc+/jSdyfBrd7ohBpRE2uqc4MXnC3updydT25PWNDO4yuUqBfVaGLUulKaolPvyMgat4VOyUS+wiQKnx0ix29cU4AlJU7A2QY/Opu3KVqN/LN5EahcDp13qLi8BPew= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Ot8ZcBY35YyNPeDKLaRNDUPOWafqxhlY8juijR1uRwVNKlbtmoBadWxZXd5cb/NpHdr9biZCxZIhj4VUuGBJmHyngoa9UDbNmvv/PgE1l/m5pNPLWTKYQ4XswnzRwywQEatMlHf8h/6zPeVvNxtW70+/NCgeWKfeJ17PZHOrBT/KleaYe5AY+tkkFtJfeAqDPU0F+zy3OI4pzd721f5VU//MQU3AfaZXXbllvzVz0HYDPVvtjwGGetE8tdqHiuOK3k5mtdLtQJ6uydIy85Q57Qy+Jr8n8X5hlsy0DvNDK4lgge/cZQPNlEX1x2YRJbaOA9kZeQ1MnjSguoJrdC5os+R0leDwuSSRoArInCSdqrYzL2i8tAFqyimYj0KNTOWbIJoZMPHaUBhmf/c4l8l7+C7praFmowRj9gfuQAIQD1BiJqOUGmyOmwe1OW25AWp+yRWCnNgt4cvX+Tc0kkj/BsnGhMszGhQM0WrGt4OzoHypZVVdefjvd6hQUvVYm+jwD8BW63LwOt4hmJ5AjpX8np7uM9EUX4U2T+ikzKzXScNa21ntjQeB1f0VGX/jAP2YaAkFYbYEQ+gpLYY1YwA2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zscYtNYa0Kc711kFZdlAhFFDeDhIhtOIdYiOetkcEZRagz6raro4oOaJi2CKo8VkpYjQApEZSTjlJXUX+2nOem/q5QtYLycI0aC+I8D0KdqzJ6Ql59aRxrxhAYjTG9U13Af5BITrg0TyZbLRjB02LA5bRXg89kgQrSRYzsHugIpPnEmsIBGY5n+cdjNxqHBYp5n0Gbe6/Uz0w0YnbLCkx+MNjYDNOAOizkzxnD04l3N2DVJ6uQCt8WnLjhPHakogd10+woe393IjtChBlJQjE0ZCZwKFM5GEcrgopI04ftucOK9R6e0LsMz4M3mn1sEmaF+Tn7N43uxXvKvZidZU7ErXHdvwTZnt+I2pw/RCAcnRwvTrRLVNVCqhZc/ygGt2G6diXOPL8J3J00+e568WlmYHQNc7sJHEu2aslPqdf1HlziSJR3upG94dyfsSYmyzmcKzxdtttPfRGtzZkthTDjj0D8S0R+fR0lee2SfvTEcowlXaM5ZGHWJuVY2XcLzIdLzCaBjBWI1QYGK7nVeYiTwFO9CaUVsNaasxFQEcLGKy7Vo4VKneK0bzWcf2Bka6ul2xrtSJDW16+vBNOF26/7MDN5QjPgUSs9iMMQ/w62YDqMJEp/ftVJtBI3OzohzNqKVLmRmjfgyeYtkgwD+3hYQAotUoK4CGOsr+AJAZHIAiEVcuxck3lZbzMInHy5zonPac9sR4qxPnB7cbns7O1v6SK2RSzMQayb/FyvfnPY0Dq3edgVgmZrW0dhEIEQETh8WFMdvcau+4nmeqmWJnzOOq22gpcCI8PQnFs+2BdEd473WKJQKKtOvSEtOMtg58UdMFXOaLC0y7q71x4L+++ckciL8MWuuGE2G6MysQSfXDAWbRLA6Ra3YQsBn3+ZznFRdzsky731lHkFMCOUPuylKG6odJjULAvi3hgjfLLjFNQWaXDHsjbdT/FRzuvOm/lnDJHnrqwYJX5lMaus2m8w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9707ebb-c059-4df3-0489-08d9c5f490e3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:04.5155 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 20/30] avcodec/mpegvideo_enc: Don't merge decoder-only fields 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: RyqRxPoXq+Ct Signed-off-by: Andreas Rheinhardt --- How could this ever happen? And why did it go unnoticed for so long? (Btw: skip_count is nearly unused: It is only used to write its value to the file in case this is the first pass of a two-pass encoding; said value is read in the second pass, but not used.) libavcodec/mpegvideo_enc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0c98629603..0279816d3c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3404,8 +3404,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(b_count); MERGE(skip_count); MERGE(misc_bits); - MERGE(er.error_count); - MERGE(padding_bug_score); MERGE(current_picture.encoding_error[0]); MERGE(current_picture.encoding_error[1]); MERGE(current_picture.encoding_error[2]);