From patchwork Mon Apr 29 21:14:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2273026pzb; Mon, 29 Apr 2024 14:20:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX0SaYiyejIyZV/Fy4LC4FR+nr20xAVCux50bjVXryR7OYRsj2Op33d+M56stnAtWc8ZSQFnX/21T5PE1Q8GJOAPMSYYIUJ6nkwFQ== X-Google-Smtp-Source: AGHT+IEvmZk3ztokPuwHgZ7K/fKGbcZZzyxr5x674HqLs/0B/hvujOW8ugS1pJUOePihG+d3cN3F X-Received: by 2002:a50:ab0d:0:b0:570:1ea8:cd1c with SMTP id s13-20020a50ab0d000000b005701ea8cd1cmr568530edc.35.1714425656516; Mon, 29 Apr 2024 14:20:56 -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 bd2-20020a056402206200b00572709bde89si2915143edb.633.2024.04.29.14.20.56; Mon, 29 Apr 2024 14:20:56 -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=VEq1MP+g; 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 0C42068D644; Tue, 30 Apr 2024 00:18:26 +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 939C468D636 for ; Tue, 30 Apr 2024 00:18:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DlBH7CbfDPQdJ9e6ijVaerEvS10ZVCbDiQAQ74rO9U+jPvPwFl4IXdWUIbvmVgSu/DMwlsEX32xy4irrJ27WmSALpYsKI9pI+KOCTsHG2PifkuA+y6Wmm0DG8Yg1Mc0RIErUOBb4Ww55P8vv/7BrfEXEv+YDErQzZWt7MDN7clCs8miLUB2VDW72HS3Ocdz+TTnLGFAd+jU/O712mTfrpdATKS14my2Io/gUkuEArlnoTLT0H4XIVxPqsbzTz+ipRITmbrzu8KCkCdsijL9nmaw3yMlH8xk8o91r7bemysE/uyt87WOWPcDVTI0P5KgDuF+GZlsyr0NHqKKu+sgSQw== 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=5f18DA8XJY0Zp3ed7IoBYo0jIsU9BZ75uBcCiNBTmOw=; b=dMCZtXdy4HoKdW9UXVa6l0uG7GWrlRLNK5jUXc4GwdPQcwyyAzqpJsGxaP0o4GDiWXSWPpoGhXKuyo9WoZZcV+gU5ySeNQEqeskIXnwxl44rnQRQiXTIEfOW35aI+tL9nVoTAhp1D2kjOJgGyrtVFj+f6jUMmDNRKLJybi9q4bkgcgrx7OLqAZcq1m9NB+jr9qgm3PBkJA1WFdvfA0wLTW6kKSkOGRjAnYXSRQ4UdXuB9uo26M2hkJr9AV+KByp9x+l13953b2d1MK7QP5r4vtlVVHTWP8xquSG30hSWGb4f6u2wHcPVNX4aSZTSrLDGoEKDZiwEHNpfGdZ5Oywrcg== 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=5f18DA8XJY0Zp3ed7IoBYo0jIsU9BZ75uBcCiNBTmOw=; b=VEq1MP+gi0hA8YLcoI7DnDpw/9JZYPoSmVNgcGsMALWQwdCN6jJqHsDhnlZ+V5IJfobnPXnXmjsXKNQXvssWdZnBXrVA/YZnlwbdbMzOXVUILml/D58jTqIAEvziglSKb1R12r5CZ0EWAv1BAz/tNJqmrIoyre0lSqIHLjvnTKI9tA2zQwbjFE/TmRvyg7uKp2Pcp27p1166wSEOyM5QdMXWqxqS1Fv9w2qubmnubdcSzKU7XovJ+3rEg8Xpu9HyVL8cu265Af3bULQlgEYh3lpo9qjrpW4+Q7r6ggIF5eLz8a1+MPHxBr8LwaYC/VQNIpwQfBPvwhJTPhlvMDsGEg== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Tobj+ujffSedLaWP4ttWvXaqkPUMdEKvlxmegmYI6cQ=] 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-38-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: adf1833c-6608-4361-a913-08dc6891e3c5 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 7Px9xRRPrRwmo3V2khzS252acra1GpVE8jL9nyw2VO92B9W7xU1GGtuJR5ys0P3Bb8YSTzdSrbDzmIrh4Obwxc4FAA4R79mpK49ZLiD/AZM9zXYoRupLN0D4lJhIW7UqI9fGKo90DIeuEeYBvSNwbQf/Cufx+PYqSIoMudbj4LNzlZmA1C89qaUGPst08jDog4lEmi4fR/PlCNoVKSTjqkbWMVvuQVjszI80lEbP1lPEwcHeot/Sp21LgNXSC3szc7+bBLTvxWKuDFb6Xq+uUNLxIrZe0W4NeqthQMTGjo+05Qk6I9LYblhge9WNji3Yao4w299lbOr/SnS4nAd8Yt4nIlZg3+pER200A4RcwLP6QvepVIA/qN5SprhHJQk5Ijl3VBClPb0PczgE+mXOzhW7IE2RpXnHk9SlGMkn1uTavS7JHoPbYb0tSFB6BIZcjN0RpRw5l6O/2cM6xi8VkNjxhAeKcZFlsTv5xf/7FH3Nu14nhKoP8aM1wD1NKvkAO1So8oF59TUJn5Cu69ZgmUBY+wHDghxczKHL2aZwpUO36HV+Yhezp+gu0giR9jhcegz2VJxyz4ZKm+0h99OBo3qx6Fz/cjWURdEM67Z1SoMSRiyTDx1unLsrqKGpBfyI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c3cuG6lTTyEsgpOhcr5W0RmP4aK0+vkVvHzXZmV2sOlGRLIVKSUc7SNELmKxbFvi334z+nkzGSI17dV5hpyIbAP1lAwW3EsCg3uafzCdFKBJG4QRVk7IlXbXCckbkKI0FOjRNw6h7o6N6wIgBGrCddaXt6EMiXz6hcVuCHjZGeCIyRV4TnR4VDXVuhDgTqNnHtPUG2WYs74LWqSI/1sRMtjwoEe7ZcquatZlhyJfbud0WxHES12uQDBhqozrq3KK9Vz9RLTVSwn5xbADcvvJObHF/Sry4PQIbU+YLicKzaHkdz+XUfmI1dgbhLUoh4fqDymwTkSoZlP000yODbPIUJY2HXekigcOaL7mZ9vfTPy0cfrthOBaf4k22LpeJF7G+ouW9gRJw6x3OvDocW4foJSuErIIpffhKJpGogsPBd5auQtbzUgdJ/O1ExMPtPANOKoxRbqvisfeLeGRombcfwZkmaKLD/zidy070qmR+2GznmeSQwhHiq+5VJyDpKXyztk0iPGvnURP7kZ1La0nyLi+P59MkCy18Pim57bqEWdf9Qm4Eh3TtUcqCoZ4G6fCzmQaartP5ow4+0goR61dUfbrHJxf4ASM/aLs0z1QZ437eKIRDnQQXRm6B4pecQxWhyiiscrxjmiUAIinTqRnAMEF6kSGU3sHdCu4XKMqDY3oxywz2GVQNXlTGxrMEUn/fMfEzkA42/bypzGc9zp1sGzYYR0K5q5Oe4A6W1Ka9ytHiITojSTfS6aqW+tOTdOlvDp97rG9hJmz1t1uPrG25ocxVRjl3WpTQhcDoR4PhbfTDoBtMnVXrA4jTnnqS6tfkYYOh9r0Cd+aHf5kTeRom60hPsFSDinOcQA3JGfoTo0lufl1w+GMCBfotP5Yt8Oke9OUwt7bYS0VrT0/WhWz/v/FezwNxBmVJt50fkNgjER332/K02esKkpwyMqMlHzIGq04Gol40X5nHCdHml028U29CAKdLERlNyzjyLKVi+VVeTukRuf3ZmWlYX5GNvYK1Cl77UJaEctBuWXdAd0pm3Gv51Cr4fAx5W/rSPLi44irMy/C0jsEm3qEkWvJ0zSWuUK004PILqxrIWvyjr+SuQvfQuSj4VXw4A7K4mzyDALKa2TK1BufwpNVJ1oGkZ1KdBj3Tmr/kHenP1D/uHc8rIicbzprnicFJBUgEHOc2rGtIS1Ttn8IT9mdFqI1sgHLRuYN/TzFJQX7BEp3WlT43qh+Je4cRxWUGaEECaPoCmdx3mzskoQ0YnpLpnc5x7Z1Hx5bn5qDl561awIBYUmRiw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: adf1833c-6608-4361-a913-08dc6891e3c5 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:18.2662 (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 52/57] 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 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: cHCRW8AsgPlA Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 1 - libavcodec/mpegvideo_dec.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index b5c3de85f3..17516f6fab 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);