From patchwork Thu Feb 3 01:06:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2043709iov; Wed, 2 Feb 2022 17:07:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxK5XBP7k/2Tc5xcdz6Pcb8SVHGKJ02ROiJ4pWFF4zRMLNysFeAGGnPsnvkkojERZKv6ETN X-Received: by 2002:a17:906:a002:: with SMTP id p2mr27819484ejy.129.1643850477463; Wed, 02 Feb 2022 17:07:57 -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 ne16si14986970ejc.424.2022.02.02.17.07.57; Wed, 02 Feb 2022 17:07:57 -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=TXnw4u4N; 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 489EE68B169; Thu, 3 Feb 2022 03:07:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3705268B158 for ; Thu, 3 Feb 2022 03:07:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VfgxAbk9Zl+6QDRDJyvj78lbRL/O+nM1u7od/lxEn0LEndXS/AW54+Jrxjw46DygKkTBlOJ+3fcvZ2BPYzVRBkAIlZgaRRLnD4M54jJ5o/GOrFWx9tQWwB+C2hNr0d4MOAtB2k8Tkw/68BtFcvlzV426IzQr2NC2KA7xK+d63nDc+yrnhyQoqFDx4P49aRW5h1qHZMipyum1EGC0SGuV6W2rLcUrZ8DRtlWxM4/Y1qedDaNtCsA1bQwk/PVa91IRbhQALSc4eA7a7mbgBNbo/nH8gmDINoznNmuTefDT10I1HPLIGq6y/SzZ4l7cQ9Tmo9ZdLoo5/Uh6VEGrMGt4gQ== 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=VKOsKvgh1N0TTS/NOoDZz5v0Dz14fF4VLOG2CyFGzpM=; b=d3dGQVl8FxYsp6SQEZvR9GYpjHvihtccB+9G1SBbym3lTpQ8Jq0fmjz3ta/e3/Zz+yrxVQXup7Qg2G/Cce0lrD6/HnBvAwaOHdTTN5/q1iUGxEt9ekd8ROBEpbGhnmKxHH/5LGVjBC9i5p3RWGwdxQk5hKrFXOVv/tpMENRUDRIHqUM/auzVSpqu/yRo6+LogU3syXfZtQwl9pSHESzSCDeVFFXuTfvetHYkCopQ5srhEjAil52mbfZk/U+4SBliQEUI98hyVBwNZLP963B7QWHXBjzGFD6x8VR7PmUoUQGerqiEkzIlhuXx+lSKPVZiDjratAGUzR7DgNB+cIG8ag== 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=VKOsKvgh1N0TTS/NOoDZz5v0Dz14fF4VLOG2CyFGzpM=; b=TXnw4u4NVPg5vhwUA0ZpvCXelc78ihhyaJo8+eg5dlBmzPZXDN4T1YpvS3nWKAkBd9XhdpmisN5gcV91gut4a8BeF1e1mPcmTj9pQK5rSH3wsS8l5Q7312Rm1rRhT1wqFfjsiUOjfuEGiAy2RZiSAnI8wObXXRp+QKaJi5Zj/ijydux3YPUu7K2Bm/ptzaATWDFfbNCS9R2sWg/DikB5SrD+HKkWtcVEejWyzsgNzPj8t6naSQ2AsiwhJnv6bzp5pPWrY4kLOvOzVZOsQMgwsRbncAB3tzwN+IYtgChIZzjl5xVMQLrAhQbtx8Kz85tiwOx/t3uvwsi1yoq+dbx2OA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR0302MB3203.eurprd03.prod.outlook.com (2603:10a6:208:11::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Thu, 3 Feb 2022 01:06:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Thu, 3 Feb 2022 01:06:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 02:06:31 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VK8pY2pwy1vga+nTmNzYnFMpjnXzMkMB] X-ClientProxiedBy: AS8PR04CA0125.eurprd04.prod.outlook.com (2603:10a6:20b:127::10) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220203010631.1929837-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0b03e2e-f11b-4700-b1bd-08d9e6b17483 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTIIJz7w/iaHvlKLnqIyVAx6qv6WnZ0arBwNe2fmGE34zrSbu/0BNkYsKVMRTwWJQvjRBijxnYRBrmVv2QkohvxY5qcTFWH8YhUSlrisiC5HJG8etCi4VDpbcO6juQbElEv3g9NGAfjD/rxMSX4AbpOBXOgWLaMcbZWPVM18UFNtkhHEp0o9ieM0sTeOmd24OvXTkhiEJLafS8Z+nRkRLEACJzr6qzoLO1ZkzryzSyzO6aLGdvHG4nMvH/47dOAJzLNWvzZ4ph1Qmzx33JB64CGg0V+66OEZfalNXSN498Bqo/yoLKE7nNQXc1obx2dluHFTArzJEyhtel6LJycGxJx1YURsbC9hRc2et308awCu9gr5bVz+Rt5HD2n8DlIfpwmy3G2fSQ7DPP9lK+EgzJ3jyECWZmZjlDSjfYz/+HtGJXWoh4fX6h96lzGVE7MdKzc1yJRuLcRun7oRBdAhJPtYd39VmedmKYOe10ApYiP7v2tygpty5MRqrFXvD6wfX+wUNiIJ6pfqYvCw3xLbmSYTI5n18Gar2TraB0tFBqc+e0KmzLTNSmdQ2UOWUJ3KfMWlNWuB6Daf7mHfdgm23HMsmgFlTObDOpuOfhoC7da67rXVUy4UumPaNNYiIpoLBlgFM82MFBBvHz6uj60k4DNiAJBx22YcEqsHztFYDkyd5S8FjZ2li5/DoCE2P0is7nZ/8GKkcKjUd6kwLe+EOLjmBG2MiYminDZTEEIzBrdH39DezsyHobq5zj70/5T7C8= X-MS-TrafficTypeDiagnostic: AM0PR0302MB3203:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rrZwX0ejZ75cqeN6hfz5uttJ9u0vBrBAA2/Z2gEhljuUjlUmmkDI+AcZOnSueW6LqpGTQ0uFWPWuMK2Q1ehaoAPW5pdsG84u2fHEVo0E6qGYM+IaKvqUuf6Ffs+6H5pnJf7tQyCbXRwUhxqRkYvNBOT6Zhw8gJVLTv4Q8ozDVFGu2ilOHTfRqIB9Vv4K2foORUPfKytO84wm/lemVXnyqlwvK5pSzg6sOrAYqiM/QVtsk9Bnimu76jaygLqq9C+n3Xvt8agMOd5Km31SopQEDj1QJtOCKl+QDiPhNRmP3sadJyR/LXRTGh7+onm4Ye9heAhHNwVI0ucPZdjQ61CXCwXefpsry6ado5LDBqSAzdeujg17Qu51GmXi82iVj7AoBqX3eN1Ny3qpIBjmJ6x0YVid2bTAJ7YS1IUdXCSapfWfwBmcxUcq8Qz51GX/5gf1Lw8o9AnB6kW1Rr2xn1/9Aypuiva4SWtslnP4KHp7FbT6y7poxlQdmgQXmJy+Rzm4on76Yqm/mber3jyvdAkRqDuXDrCIRNmAc9uLJKBc6R7L2vlNwMTNZTvs40c2Wed/JPRAHNxsg+dJOQyY6L4WRA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dJ6JzrFvy3ELrr2NT7mTWv2NwsZGLkOhB0pGQ4b9fVgKzSA8kwHzOItJKH93P4Ei9eCgaloFj+2snX/SBWD3ZT53f3MpBwUpEd5jEMRilTWu1btEC1+A5W2z9wWmQaySmO3zq7ae2yv0/LXzQbw3u6YRdpfX5pQhK+Dx9IKHojGa57LV6/yVAfzkkoIaOVYo+g0XXhwINYN9PrAr4zoDjl+kKqh9sAi2Nt89uK3QRm4+agckhIqMjFk/xCRaz3bhylhHXKaKPWZXuNqzYej06Dp1UZYG3ZpxVhMUCfn6G0fiJWqkPmaD4rxipHbOGv7yuc0bok30iNExqkFNhLOMARsC6G10RfKy/S4/RJ2CWvxSva7o08Bq+477J4kBsBG3LdgylMVIaDcZNYmPjbXywIeNshysRUdX9Qt2cKkDYkSdB4cyG40fQeZIClrwXE99KknqCdHkgwZa0rAhW+/3TCEcxpTQQkzOkE8o4SCma+vtztoCWJPl8IuKxChO8s6gn9DS88Qn70Ka2EtZeV1HYi0jPJ+T+qQvpjx/HcEqBq0vY9VruGonPKYhtsgTApbeHN5KqcxeRZvYjBuQgUHV5nJzB+h5G5Pjbhlp41j8yvEewj7eQPjX9ru2iTqVSGuG6vgZ3uoLiXqNQYYMRZPteaQ+T/nk68xqEh+3YPLzgFKvy/9YqTs5TKbSayhavGYO2IthEHMdyt/mKD7KyJzH6pA1tBtjWa71f5McTHHZzbZQ6RRfLT2v2H5Fm0fLhvpZz6Dnd2/rBUHWLrMKW9Y1H30Oz6qLhPWd7T0c6ovLBHOzYIvt3JfBFG9xEDxqI3S1AGCsYXWOjUh9GHgwwCWdK8zRpJnwGnb+HkDy3mvzopNvyEi3B377O6CE5FJU2eGLhaqBE2QEt+Zg/eFZN18ZYOkRkH5z5liMXAdMOdDb1NcQ3H6U+VTuTJDI3uYaYyQ2P1R2qWE3UjhiRd1eZVuAOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0b03e2e-f11b-4700-b1bd-08d9e6b17483 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2022 01:06:49.0378 (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: AM0PR0302MB3203 Subject: [FFmpeg-devel] [PATCH 80/80] avcodec/mpegvideo_enc: Remove redundant unref+ref 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: lK6MCYv6Akd1 Setting current_picture will already be done in frame_start(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ddfd123c46..9c68983205 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1598,11 +1598,6 @@ no_output_pic: s->new_picture->data[i] += INPLACE_OFFSET; } } - ff_mpeg_unref_picture(s->avctx, &s->current_picture); - if ((ret = ff_mpeg_ref_picture(s->avctx, &s->current_picture, - s->current_picture_ptr)) < 0) - return ret; - s->picture_number = s->new_picture->display_picture_number; } return 0;