From patchwork Sat May 11 20:51:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp300593pzb; Sat, 11 May 2024 14:02:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdchMpR6kWf56ytvYE6koCxUwUyvjU18e5eR8SBNzZP3uLfOOCkzsbqSkIexaQDtF3Ba/7R3h8sEg6loApyrxHEcl546/rOamkjQ== X-Google-Smtp-Source: AGHT+IGyVlA+kJsqMiEPNR0LA+niOea2Pwf+UMNbCMZSrS2+Iyde0IrV91G7vUT2l3aLCEbkEJ/P X-Received: by 2002:a2e:a7d5:0:b0:2e1:5684:8fa3 with SMTP id 38308e7fff4ca-2e51ff5ce98mr46429521fa.22.1715461319853; Sat, 11 May 2024 14:01:59 -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 38308e7fff4ca-2e5136f95c1si14992331fa.380.2024.05.11.14.01.59; Sat, 11 May 2024 14:01:59 -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=aU6GeUyd; 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 C8A1468D864; Sat, 11 May 2024 23:56:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC52A68D862 for ; Sat, 11 May 2024 23:56:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0WX8RJWyx4Y1QUgmVJ6pz+jUEW2u1pkQsRbjjBWGOkyL+X606WNREk+MuX+1ac9oGwJ5d8psvLvsZTYS7RWlS60CAwbSDZLaqbHDnw9z/34kq5gNHFTAXsVaxo8m6Rao4tp6EFCWGWfzc1LMUbweA2KNcnmBMFHnosJ6qhQ35LwgU0K8l1xjbMvTwnLldrko9GEvcNmHzxa6pJci88XTvWmGb8c/7KSBOy12KhXbg7HbI4AUQe3AQ+DnlEH68yvTKyhUWgXkmvGsuAmlbj8nzfPtmHvZJpw0jc0zO0ityLveS0mV3xAsV61YOhj/IReA9vfiaGcBpciCSwtYDyy6A== 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=DzUuRoKvMK784glWYYhDXbMYlNHncoLWO/5GJrV3vm4=; b=i87xgM0aUyD9q4EA2yxN6a6IN5uX0+Y4Br4Yxg+LGeAjaVmsuW4i2FOKYfCWoOsB5nWXNHHSz7hZ1XI5Q2op78UG7p4CvS2pUClRB2DmSykNNCy3I1axf4v3+BOB2+j/xonmQLxCknpZSYZbhZ+cDpzrLqHQNMeROr9vTSKFpEdiautsfouPWcHdfIpy94X75sSukLTnA6tnfjg/3aDCBUEPweQG6eHEOcSIg1em/N2nkKu1nZQGNO+6jkHlPXzPuEw0OZT1OX1eLZ2Ncn3oxkty2X24rA6eICJu2NAKvLAjmcFPTEt0OB8rx19RtUnRfnIUOrF4hC7S14hEcttXoA== 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=DzUuRoKvMK784glWYYhDXbMYlNHncoLWO/5GJrV3vm4=; b=aU6GeUydxuG0ylI6KnxlVlfigg7MwWpmh+fZBpvsBXUTbnymoAmn6WSg0vjXbPQHXcgK6Ze5sOKYqqRA1GOJ0N9Pfd7eQ/xIuYXGsjpCnRUPDxdUDh3ha8VWqP3ohWMNY7CrwOYBnuvAtoCA4FNtRs9H9ZWIipVCdv9BaNYdK6xp/Z2BjcjKqdS6Forp90CA13d0n3Vfb8T8d7r23k8nQ1nxiXKi3rLCBif3ybqYPdNxdMW8Kv/HFKCGCRg/ZYbQGnpZrVHD9OIJ2Hi7oN4cnyNnhGtOE6xCI0NtnuuNivPEmnxGZ0skgHv0DRfvgdXdZuXQMQQuizBtgy9zBI2XIg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0074.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::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:56:41 +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:56:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [JRuewSxvVKNgRSfAJ1dJMzF6yD0lVgjuGr7LPStkmTA=] 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-69-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0074:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c999b9f-a216-473e-7f54-08dc71fcdb6d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: oGEScgQ5X4/vwbY5tW0JDRItrbk2EWWcCD9czQP8OguwgJAWGiWTYXVcSlOsadOTz8WxUc5rVunUSKE0xZv9MRsnbwfZ+ueodAmc1GZ0SPCAnR5JCJd+e2Nee7sGK4aaPpmoFRH+TqaWUfVpV+pLVSxhPV701RL15gL4UpJYTL/AK+eTsrMZhTlY/G+Dg39JuYnkdM5mvPi+i6D5yQBntRh9LvwIyCZVnNmX7XwQYCIZQmiDtnVHPO5HnjLDkWYVtu7wuoMhRyWhD2h604PAQpLbxoT2pJsvhxWGrPbaR8Fz8kImkfsx4lX6t8n2Izu1vm8uoP2tFYIQUDVNDH8n9bQUYXm187cHRMW/2qmaCsLOd93BSRb/tanBByPKqGq4sTv+Q76f5DtwlCVxV0AE6oNHUniBV8SZOhtwbWo4US7EPJowRLNL6UTKU+FuKGrYMQyyhuoPEh2p4ZO964VqaFbX88nNowqu/9yYwppAiSde56Gm7c0Jpe/V6zrxpwQM+DmO2qh54SoVBjzkkU5VuoFzbVdNBThHtynKWCpfKX0JDoo2sKdZcwKvzoXq5qRm489Vfk13teD4Qi+p5hDG357QZL6tM2BPqwmh5XYCm34UtKmfi56jASbR53f262kd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3bSqKqHA7hGB9XRbvZTlnkUMS7LT8DnehIQ4G7jy5tCGXZM/iupP90y9qEOgCDtyBmQI//cAKCxBqJXTWRNzGo1LWWeOpodECsdVaWUBdDKH+0AWO96VE8izN0e/TLxKx/SwqIWnuzPkaDGJGykanvxB8E2XOuNHiqmkIwOfrU6vhuZcbO53ToQhK/SbJxvc2atfV1rVpJ5uieN+Mz8LayxijJGGCo29LNOdbgnjZtvlg7YDcuEJwrHZExrNaA4/5XsLcGE8axirOsRHoolZvQkU3PG2qT3Eqa23BPiKu7hiUzO0rPkJL4QHlV44Q/1X9eenm9vRKSfkE5iIntFcBTneDTxXIc7IGOMAnMZcRWg78XibxY/iM/wbr7nu8fE9v06n+6nN0x656cdD7T1zb+K9nVyaWajkZiWRxch8+IzRH9LDNGv1okjfWFD+j7IUZ3fsKW3A6MiufTkk2jXoWnSnAa3JcxbVGXHEYlm7DhRt58VZoHVMILxTF7r/XCjqnROXHc8vS4porT+bYU0A9OROQ5ao4FecgNdAjHRFnDM7dQ4YoUj+wAn88fPRGMduiW2AiQVf3vj6UU+FaRtC8CW99VzOVBL0IPrnim++SeCWFeMrewfgsG/kYLoYa9b6p7xk8uEhiqopKwupoQwbFbWX5XFeB75zOAumkulnpf9XrMTQsnx9wVS5M1NQeD+DC7NXI8JB9LMbQEaB/Wifn/0E86xHv0i4nKV3db7a8tjczsXGGyGs5JTjlar8SXG9UhmwiKn3WlY2V7LlYZtEyJbZhlUI32L2L7omS8eRKLfVuNIVAq0m69hkSL1qr51evvZoYFPQj6pmKnUnlbNEESlsE7GPjtWqMJkT0g2tZD1vXMEMMXEj7aLqgn7l2gKPah56qC7QCKutmtfCIiLZt2hhhWvODMdW/GQBiS38pIqclQqPnDeouAw47fTNxqvUE44tRcwDXY22cvWtk1sW+9D5PUDdlxLUXF0os+Am1qTosWqKmDAZnjBw1jQKI/uulSFsGgM4oX45CR1+WPdLTtYL3odFjo3IKWx3rcuNK4/UF/XPRh3LwMRjtZeXvfEWU23K8wuzwqpzJoO/lUy28RoBTBpEe85O24JuYZ+mnUhAQbZl+hlMZL3/hTx5ehsbF2yc3sXtULHx4u5MicIwpH3pYpqtt+6hKv92XEMoaW5Ac+FmrQ2cIIuiDxUjnl2zZNL0rG6sULqh55JLbUXtvF+jAJB6YFZaB7XNKUbY43iVNmbfsgcnCPbnOt56woAE94uNiy/FtlpGdhzGXa+mVQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c999b9f-a216-473e-7f54-08dc71fcdb6d 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:56:40.9669 (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: AM8P250MB0074 Subject: [FFmpeg-devel] [PATCH v2 70/71] avcodec/mpegvideo_enc: Binarize reference 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: x0j+IgzQxjPT The H.264 decoder used reference to store its picture_structure into it; yet it does not use mpegvideo any more since commit 2c541554076cc8a72e7145d4da30389ca763f32f. Afterwards commit 629259bdb58061b7b7c1ae4cdc44599f6c0bb050 removed the last remnants. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 58f68ef5f3..401ba8ca5a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1639,8 +1639,7 @@ static int select_input_picture(MpegEncContext *s) if (s->reordered_input_picture[0]) { s->reordered_input_picture[0]->reference = - s->reordered_input_picture[0]->f->pict_type != - AV_PICTURE_TYPE_B ? 3 : 0; + s->reordered_input_picture[0]->f->pict_type != AV_PICTURE_TYPE_B; if (s->reordered_input_picture[0]->shared || s->avctx->rc_buffer_size) { // input is a shared pix, so we can't modify it -> allocate a new