From patchwork Mon Apr 11 23:50:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35268 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1303780pzh; Mon, 11 Apr 2022 16:50:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRPiAqGOOgWkfrNXlNCVdUY3g+ennR377yUj1irrZVbPCxugHV4qU61KGkQZIX/CNO5Mbw X-Received: by 2002:a17:907:7f1b:b0:6e8:558c:5ba with SMTP id qf27-20020a1709077f1b00b006e8558c05bamr16599981ejc.522.1649721044715; Mon, 11 Apr 2022 16:50:44 -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 f16-20020a50fe10000000b0041d807c9ca9si2699842edt.81.2022.04.11.16.50.44; Mon, 11 Apr 2022 16:50:44 -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=RuZXTy6i; 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 5F24C68B179; Tue, 12 Apr 2022 02:50:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064077.outbound.protection.outlook.com [40.92.64.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76EB468B300 for ; Tue, 12 Apr 2022 02:50:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JhzB5PO8qcpeODqKxDhtvreyr8sMG0TvJ4eLhNHZBqTodnC/Yaapmy+MuBTRiMYqNpaDo0si5s/EeMhEreWw2awB2Qz38tWaq5aEmZ/gjp9GYPBaiGZuCVmQAQEetpvqNyc857DOMys6NQJ51Nk0wqocoIBI8iCb45Ex1k8bbGLN/lL00FvO7MeicoPuWpJ4Rhc2KIEf+NLRtC9g34oUNxtEszR53XnqHu3NN4kvbygbyD32nhNeDxFjMHEFck6lrNqF380P0pHxl8MCavykpE9d8j+8TaGau6vVb6hV7Mk2IlkaxRlKIuR1euc4v06q5tUBItFAl8YeBjxkQfBR1A== 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=OuJ7SJ4hPXZdMsm47jZ9N+u0ZjEz/VcZ3vVlaHPXasM=; b=arVaVxj2yNjZmbVbxx6s6P7AfcuaQTYHsAicFpIMmc2GwHhGqD1m/naH3rz3pkwfdg+kVBV56pq68dYbXOclEukzR6EnOZztdyk0kJkwTiXPo6ruRBaSmPqiJpalSMJV7iFZBBEZRE3O4B/lS1sfOODvVqvfaeEdALZ+eD9e6aSvUKuxuiSweie/o11QGYuwW5zph/YYkfEjST0S1x76OGhCd4yjcbtC88TVRoNJxD6KbNsZl1UOIUs4yraiOEzV4JoXGH8+VNwewHeJGcAjiDZmdeiub8xpKEUZ82GghjkcsGneCFoq767r8PamSxyy4NA2aLIOqGOdvlVV1jJIyg== 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=OuJ7SJ4hPXZdMsm47jZ9N+u0ZjEz/VcZ3vVlaHPXasM=; b=RuZXTy6iStXFhVBFAp2rAWzPlpAfaQ6dEU88sPhJwG8TX0OwhhWUSlQjL2xrSlijhZ/rWk7B/qvAH+/zcDsAaQuH9Zz7/FlAqIvtSVZAOF36L0svg6gquaUY4JSvwQPg6r3M8HvGL8aLryTzg4AQqXL2VYV12/WNgSzag4oO17pR6OzyCefsUnfGu34gEiEZssxZ+ino18QnyYIb8IoG4RRP+sL/DZXd8MQibxXwst74aWJhiO3vLkUAzFE6xUBfTAGMy1NzkKk6gNltVhXsd7Ub3uiDJurgYUz6751ZL0llqkI6wPuTcObpBH5JcVwZRssb0QV5l7AQho7sqrnJVw== Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) by DB9PR01MB9977.eurprd01.prod.exchangelabs.com (2603:10a6:10:300::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Mon, 11 Apr 2022 23:50:27 +0000 Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000]) by DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000%7]) with mapi id 15.20.5144.030; Mon, 11 Apr 2022 23:50:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 01:50:16 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [2VHZzSL6+GiyTfP7qsbcRwBiuuz4dka1] X-ClientProxiedBy: ZR0P278CA0060.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::11) To DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) X-Microsoft-Original-Message-ID: <20220411235017.316325-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb1da734-aafc-49fe-24a8-08da1c160dec X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWTUkYsfs8LU5UR1FY/R//Y/IBNrIYWrFUBT/1J2Wto/TrUsJWv4dGOx+HnaWSZdDa8DS8NK4/Nls4n+n6W0Tx72y0ASniurmJwVeapuOjNnvSk4j92YF7rxjcIXcXg4toiNyzJ8xbrGUiBEUs9KqqWWUXcLIbzkXGF3Nwlw4GC+Xp6Qr+KoTeB83MW8Vx6utp1SjPjN5Ubys6skc2gfcy/UsZmHG/a+mrt+7o6WS2xFB9jDGBkNm0EaZ3QVxCDRQ57StD1rSExFZpFn0pcTOG0LCtaohLdPxFIkWASG7x5ElkEztPfBtqFbW26pzVTZLXIy/KjBvrNGxltxZECOSCv00JIMMReP6PT00Zq/NfFRbYIzUgjbWLxqJFVC29DWm6EfabnBnQ+y6Hze4YHGedHr15D30ciA6ofhAThGimdPSFL6W7T1lB0TjR/iypNTHM9bcgF1bX+BdX1g0ZsE4GNH25/IcLwj2mKU4ABgqmRV4pi3DQhoXUeEJTRPPINMOrgV+2rU5exZpwo+J15txe25fKtaS+9sF5/HZ/IRbJNOvnoDm0lOhtA0kmHiHTzTae7Eb/wb8LiqC+huyYQuG3wj8K69rjedt7CPJWnTbZmPHio/W0YNquF3pC9hDfmJgucBfel9yAuvIncCrxdnGlyCBUqTHBge5Pq8rkXqEP4DZqvVCHyVWDdXSGoOfHLiqjqc51t8HvMmELNSDuFweD6q65uLjj4ZxY= X-MS-TrafficTypeDiagnostic: DB9PR01MB9977:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GKIbQX5wcL+1lRVWghG6i9whg2MUDGV1tSIzG3U0FqIuFVDRR7ns/WLA7pPh/T2mqwGkmDaISmRaF7JywpbJ8AORz0BAl0SPXcRoLj9XtJwOB8n+Z3o8+0Jvw/tYZYPo9ucqslcNJNnKLeV9nSOHEKwvz6c9zkn84+zedP+MtznUNYOWm3ZBS1RVdTU4f9wMcNyh4lU7tTXZ4e3tP88MFhG/kV3W05GhKkWUVGT5Bpy3XSGC0vG+yNXemO02QfEUE3m9yvmfD61s+/Ktfzk7SYzP1TdqWn8OtK2SQn4uF4ZMjQpvqH/xMUu0Nj/ybzQKfkBOgQynhFGrJITdWBKDbUfbsR68qdO9wGrQXThNxsKSgHL2gBbaZqLNgr81XV0QSFkDAx5SF0CMdxuYfnfzoWfhY+WAFiWeOCZT9v868KU15X+cElSPYCVfmvCbc3ngWLrUNGpWLAaqu/+5WtLfGV8VAWF3cz0FqYm6Da6JNB6tAXwJzLULQkf6h+/8u3IU+YMf5HPO7yWRqI8GUdHgm4vU55iknlceQT+vM/X1a/GoiGQXg2d8lfhlaZTjocYib7ZhHIgsHUDIe61+5KdWYg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VydK/P4Jf3gv3TASUJ2u+dCRWgxrXNC/in+oXeQAKadCVy3JwNH5HvAr69xR8gE1nsxAlDOu8MFo9DgepwnJHTah2LBbbUIGTITw6NTiuuvybHOMLV6kpP/J7whlatZsgURbFeg8U1N+AkC848mZcZdwfPj/CLxEHZJHCfE2SChL37Jrsq3t082DZQAgmemIvbTb3UaLgVCEJRLEzEBTQUbcCyCXnUDUc7ATwznHoH80P7phO/9yMbcPrqGT5lfQjaWalF82XW0dQ1Uc7PPpbuLYpMZWXtWNn5UeUVnE8sQcKDDSC52hGJIksapP+ITZTgCjIByi7d0b5oTLxHTCV9ovwh61LkLBvqNg4IAA6Tfl7xyR0ZL+Dma+m58PYRKcOYuwGJgB7L+dKxct8NEOq2KbNBrgd/fisjp7WgBlnezvI98qWyMHH+nVzuRfn7EwNDxxUHzClLVr6PVH/iCMNxG2FIBG/HvsFF1FN6bjGpjVrC8U4tkSdsPt58T+dxNguFl14jyeGyxLRe5Lezp3H6lSnKta7AvEYp1Uc17mIHwn/9UvSVXxzWYQkun1CmaMy7e3+If2JtkXZKTr2xqIxEc40IbxoJfpdXTdvtTCXUeNpupGaQNcSrhiT/sRJrAmfKe5nBluRZNUdfcfzL5ksGSCSdX5fHKxs4Df4ukqc87zljpuBYZ19V3WBhb15/swM+S0XSREwJOzIRRHacZiKnuDOw9FL3qyazBapWCa3yRYUNw8sXmSEDf+ymgOI3uSoZKRDNDu/wi/Y1yAPIkPWqKSbIeIR1NBr59CXhtKuBbTbz4S8T7E23rxGBc3JeDd26iRkqZ1JWfBeYtr86UiaK7lXgN4tNsV1+0bd502BHrTP+NdS9b8S4Pcb3gftB1T55GjAWtvT+Zj50XGaVFHwpRuh7kKKlEsTmc1e2EKtAYv4fUvVKH6VJsUGj3EJf1hHeYSf0nRhHLN8YIGSvavn1xmwq2lEv2LqLZ28H0FH17EX6XqYZujNGITE61xHub6dgM9FXYmW/gBoFdmBo3OaAtLXYtniabWjucD0UQ8BVRqv24XJ9pEzbqn2yb2Xqvb6Z0HpPDsKManYu3iPr2ZnSwzVEiaBFuhsZInfD4vC2uQQstZiUt3VbmuEZvHJK+KwFQFeSpzrRFzeDYS26rJG7p/vkqsDHL5QzfNmldgslywqi7DGPYtwHsQAhXaTcX0cGgsg2bUJPGZNLbsgJXTrAD6XVp1kKIF08jxaQvKAasg5sYO66c7ZjFGSBRBg3OBvP3oEEjQJGbx1q5xQ9C+xmxB7Dt8cuUBBINjxcblCShIEhcesY53PouwQq9Vf/f0rmegdsUngeR91rcOyX3PfCGe1neLWCI9MCIl85FlC4C36c5C8EvAzSCHmEh2z7ewQgflSouajdlpE7E9D86jVP+NfIaxv+e/Xnc1hrz5k1yAPKJedSspwiY/SLQGKJda X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb1da734-aafc-49fe-24a8-08da1c160dec X-MS-Exchange-CrossTenant-AuthSource: DU2PR01MB7950.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 23:50:27.7596 (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: DB9PR01MB9977 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpegvideo_enc: Remove always-true check 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: H4ed4OVfCmXN It is a remnant of the old way for user-supplied buffers; it is always-true since 93016f5d1d280f9cb7856883af287fa66affc04c. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 434bbb3a68..c9d8c48026 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1683,7 +1683,7 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, /* output? */ if (s->new_picture->data[0]) { - int growing_buffer = context_count == 1 && !pkt->data && !s->data_partitioning; + int growing_buffer = context_count == 1 && !s->data_partitioning; size_t pkt_size = 10000 + s->mb_width * s->mb_height * (growing_buffer ? 64 : (MAX_MB_BYTES + 100)); if (CONFIG_MJPEG_ENCODER && avctx->codec_id == AV_CODEC_ID_MJPEG) {