From patchwork Fri Apr 5 12:41:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936240pzd; Fri, 5 Apr 2024 05:43:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdrSG905cc1GYH5b3Ic7KVU+9mATx0Xd/3Vj9dUSbyC3q4o5EUnKk9E6U0W1TpIVe4xKGW58pAQc5NPnLiicYS/5ObRA7q89V1XA== X-Google-Smtp-Source: AGHT+IFFOFGzO4R/Ousrmxoo4LmlFRluJB1H68xi1ESLoO0lF4APVAP3J93CLAZIogc7X0znBxHA X-Received: by 2002:a50:aa8a:0:b0:56e:7a8:5db8 with SMTP id q10-20020a50aa8a000000b0056e07a85db8mr1333617edc.35.1712320983355; Fri, 05 Apr 2024 05:43:03 -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 q18-20020a50aa92000000b0056c3b60243bsi691075edc.308.2024.04.05.05.43.01; Fri, 05 Apr 2024 05:43:03 -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=gN3oFc7C; 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 39F6168D1C0; Fri, 5 Apr 2024 15:42:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3503D68D140 for ; Fri, 5 Apr 2024 15:42:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CE2oLKKIgGUuHYP/0ukuqrb3hAhxnKdAErVIMDJgW0qsS+ywiQl8FYryEckZSiUI2/wO5MgKydvmobYa0Uj6ty55tGPdn4TbqPs3dOs/BqVtpZgrMVa7dKpahfgP/rVzUnUwsFYQK/tRV9e5dIr2D1XAe/BvMVn8KZTmIq07swqThdl3OWd+C8idEvnq3wLPBaylRVX10e5R8u32AnHgXFecoXU2jPGe0JpV3Ukj7Uv02kwdjcRDEJw6A2zHWddZAnqeRWtW51H+lw49a7JZJvd1C2UZyPlfkfaT26H0AAsQyUvxGVrcx7kBceEMtt9J2T1qQW6X13IWFIDOAG4BYA== 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=lcEcWX4hKs1VAo14S1MmGo2GVCzhwm3pr/5RTgDJQi4=; b=C+uvm5TRUudCXGV0Y0iVvzdQ0NDonN09lIwQNGiya9DTutBvpQdt9Z6+yjS8LBgbqrwyFttb5Tzrr17FfmYzUCGiWc+61cKFdQbr4TucNYnxyhp5r5aK08awsbk+fNBFvSQL9Pg/FC4zp01JnmbhBcenVHrfdAlsamklRBnqN+lDU4MhOU7zRq7Q99Zn1+7DLzCjqHVd2/E5j5/sXz8TpP0PywnWl2QigoyGl8J3oqnGjUC+15fwGM68CnlrKDH4QZgHJzV1fjuKXwmXfCASgMmgoKA8sYsIdwv67Gwfo9kSkOgI4p/aUR1H3CSpM26dsG24S02ScKzOffF00sUn+w== 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=lcEcWX4hKs1VAo14S1MmGo2GVCzhwm3pr/5RTgDJQi4=; b=gN3oFc7C/LH0bHe2Uqkpks9JjpIx5R9kixfFLLZ2HCBop1JjEe/sDtbLj4qrnSpLjpqjM76l7ce2INlMrMOG8M2GLLUymmkGGZZDezxBdMwvIX5otEvIBD71hA8wOUgww8zf/12kn5PRReVoM4EJTbJ7FDhlDeqSQD5sSfKE+26oyoanwr2KHVZzezxSqM0fHxVP1SE+uFaZyuWtU19qMoF20TEom0if9a3kA7l0BPA5dxTJ06b49aLRoq4I1xXTKH4h8zPCnaeoS0O9mOEaRd07aObG4VTIn3gUTviJ7JIcSNBQcjlQZZYtJwv4fnSBYYO0moXMhzOdN26ZVCXjrw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:32 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [rITMPvw7Q2G0Dl3wnIu5xWFK6q/fbu+Vl2HURwRQQN8=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a563678-abc6-45b9-9d79-08dc556dd267 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ofUiZbQI+sLT8IkCYXMyCPTi+zKh+rox3FR+YgfGzuD1mKIoRYfI1Sh1CISv7UXHNW9SJwqyU5vOMMsQwd1nyPXNZpKA4wpEy2eJWqTBBNekjUCVViuAQYa9DPxVHcIsvUeZYS9GZbsygyiNqq84yEP2afG4GLSP3zxQ0MqNDnCWCfA9xpzyqHVmkL+tU21dyyEXgmtsYRhgzwwscwQiTkzUMivhC224xg1tpNFxjRSE2YwJnctAgKzkGJ0X40I894jK6pdrec0JsWzWnFp4ZaF09l1w+fTqZz1Zm3tP/pd4D3BNVYfiG01+S3oLFUku7UrGtLSXaiwHHlMfgTOlRkSTBdl64c+G3H42dsvpogzguN8gvKJcu0p8WpPhriDiM+bfcX+JaGjmEkCYdNjAGsR3xRDD50bU4UDxBs0LgrAp2qeHQbXedg8tYlQjtJHmGmHXe9EFCguLxM1RN+ntbwjvAuwoJgjHJVo/ZN4qgwS7jVDUeRvpjHVmZrRo7wkz6CiQrRgaMuwAonVYiDDOAbqZwXmqj634HYoFwdKbPW6jBxkNjLdxYusDF1OdG+sdSOyCxIqP40f3Lk1Av3gtrk3BbQqT/rXEUFF8UqE5KTIHCHurryezdLoPkpmhlO9h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HWOJZHNYk7HinqyqK0JsI/bqblmMH6pOSo2VlRr6tKqj5OvdOzw14vrnEFHR1Hw+hHu+DaKhTx29w/d5KC/mDbxZo19BrdDNwmeJjsm5Jm5otwXIHippMcF42/r4LLs6vvQ810HV9BazvSguD3ixG804s/okiIQiZAONl2ZSblQ7S6H+DAvtKWh0i79FPbRjCJpTv4n/2RzdziEIIZA1+9VOIxiPQ1AwnAaR9Egbe1ziBXcCmOyU7IHAmx/RMje4h7SptpQ9JTPMiX6BWV1ctA5EK9XKzd+Py68BS2DZMlPmeze3s4IrH5oyj4tZF1T0il1T36dNqMh1LIIu3Ng6xW8nLsRJ8oiNFGCW1MTOX+P6FrcvLGGNK0jMZMHBeGjDIOUi3uaGOJnU6ofMNh6qEEGatdPf06I+TVvwadQbnaEI3Mlvp9M/u3PyEBnXBcAKI4qvJp8kgTYqvM0rX36fr2zhNkQbZ+Ic9ENgE2Sd84PfLRL++zsBQ2K7xmcWvCcEENOxHAIpzyluDYRiSBYekTOxY/PrexIaTAz+vKicpTFvbtqySfm0MGJIH/pAmYrVgQGcUYeaKx4x2Ag6JLsCkrPjjYXFTHrQHeInXUATAZBgWX954hKqKd+4nkUwXcfB0qLxGOGLLGxB+GY40zliVLrGQRIG7nmKd9kYFAVLJ449tNXbEm69br1t+RylON0jQTkO/ylK2KoxGk/nEZ8BikKbOzLaK5zenFroTs87pbiVWPB7QW27Puay0jH8EsQE6WZK9WMn93IHpW1FJnkA/Nzpkj7nP6ZzHL/f9jkuvmZGaoLYb3tYwyCzAxmnXDUx6ABOLRBYvLesFmOaK3yBloQZod2Q8NhrLNhAzDKGlCJ2KTp8IFTGC/a1X8teQP6QUKIs8XJ8MTgjuHII0XeSi0Jdy6wqZTfmtakDkKVjHLqveaqDNhh6lkFoN1BitlKsy8TMe0CJ1BFWz+mLYINItNXEda5U9T7424jzZfOuncNtbtWHyO7/8GCPRhlJBmiSic8oCfRF9ZPUrC45T7DEdm6jtKawpXoeacrBV4jQnFCf95vRq3a/QW9ccLijoGt4SeHg8QHlK1EllCKnv6Ui2onJ6/WSe1fN/K1+xWMzZX0Xzpn7Ab/W0nLkv/XhJ7fNTbHafZ3Di3c5/69pNYW2hPE3Qh6WplcRO94Ta8oVMMirudZS0cqxWZG4Ye3VN5BXNaDpx4dJ7RieVzH84SERB0K2cLKHq+bI4qdBfQ0fuxLmP6t5uIObtM7Zyyi8Uu6VXgVXRzUVhL5i2glVGMFO2A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a563678-abc6-45b9-9d79-08dc556dd267 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:15.2117 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 09/15] avcodec/mpegvideo_dec: Remove obsolete current_picture_ptr reuse code 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: DI1wBQpIuSdP Obsolete since at least 74d623914f02aa79447df43a742efd0929dded04. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 1059aa9825..9f674488c0 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -325,18 +325,12 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) ff_mpeg_unref_picture(&s->last_picture); ff_mpeg_unref_picture(&s->next_picture); - if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) { - // we already have an unused image - // (maybe it was set before reading the header) - pic = s->current_picture_ptr; - } else { idx = ff_find_unused_picture(s->avctx, s->picture, 0); if (idx < 0) { av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); return idx; } pic = &s->picture[idx]; - } pic->reference = 0; if (!s->droppable) {