From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 03C91410F6 for ; Thu, 13 Oct 2022 21:23:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 834B568BD6B; Fri, 14 Oct 2022 00:23:37 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2080.outbound.protection.outlook.com [40.92.59.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B36568810B for ; Fri, 14 Oct 2022 00:23:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I90k8gukvVxGrNqs4ylN1kJtfE0pDlsV7IfmhS77Dsil2rDO9HQ7V5KMKcWfDhwfptIIBy+xrzY5vlUhs1bGX2Yzs+yfHzwngKa5MHcd9qKCc1hpXMd4/28Qw847jGtzWUjF78Zpr3w072Mey3wdv+ZZllr3TV+ut2ItPwYM0ABA2qxbIFr6Rig3U4c+UJgKs+ey2O+l0AcfwoL13Cyfh7dP4h8/XeqwcTJy/c8nMXbsA9REyvkvRfFQlOYioPLZAoEh3yWbVBgwMDY//DWi++L9PUqHsC6Nj9k9y2390GsrmVv81aow1aD66WqWj+koyTsmgyG8FNn5JsJ2AYtJfg== 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=9rPfZiy5rKIEotzXEyE/nEqGgnNYMKASQ6r6kud5n8U=; b=NI6R0jgizMCspmp3Gr7WaHAk6Nc40ZBU0c5XfqTfJxql8FjpYY0qT6P59BI3qAIhZ8WW+O25dfkPaUjHT1KMxAcvkJl5mpnNP3puaIkGshHzTbnsewWo85HrOPZZpzH6Dxcn3OZQZ96pBNh7TsX6ziiRWqQaiBWcvup0b/IvdKZ5tEgML9jTzTibRfWNhT3K6X0UdjYPvUQH2yqm0nqwAx5dU1xaXf8Q/vJLkzeTQd2nnTDL3mX1zBYhaGieTlzHjBSadSVos4mMnsxvCwpp8QoBA7sd/Xl+S+YI1nbf0VnPLsxngeXmkS6Frktp99FMkoWgEOWrxupMMNAUO7cnBQ== 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=9rPfZiy5rKIEotzXEyE/nEqGgnNYMKASQ6r6kud5n8U=; b=UdjXmI+Zim8bR+aqPS2X8pn8jMUhDqBxVAjAGsSQCq9ixgJeU7Zz3ex84W5Ub6qIhNLVsb1dDHXKJgFU34fSTnehYlbiZQiNGHBiDlH+n3qh5VwBq8/kzLmilpWYkyGu5lu3fqbPHovdfYh0yZtcU706pMWvUZKh0HPFIq6Q6Y6W21LvJNPvxQOr6tjUFz20nUJetZNAuXqZREhGw/O0Q+PegSRhHP3wtA/79i35NSKAo5VEG+uf8wMCnxMfgwbT1mIu8qp50zvpjz8QmuLD+rWyMtP/dgC7pVlFJpIsmDrnplZ3LYD1VugV+DXZTkxc9+6sia0EDpt2dUIihFfe6Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0114.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:171::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Thu, 13 Oct 2022 21:23:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Thu, 13 Oct 2022 21:23:29 +0000 Message-ID: Date: Thu, 13 Oct 2022 23:23:33 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221013210505.GA1970738@pb2> From: Andreas Rheinhardt In-Reply-To: <20221013210505.GA1970738@pb2> X-TMN: [0vHhe4V13DSzVxQHmyV7bZiOXKy4I9/BcPgI+3F6BNU=] X-ClientProxiedBy: AM6P192CA0059.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::36) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0114:EE_ X-MS-Office365-Filtering-Correlation-Id: d76069ac-a332-42cd-50ee-08daad612c76 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /f7sf7pp0lTIUs+OO9sD0kcUpNmlTBo+cY3EO/EvaAvYsRHCmnpm3XQMMkFDYOmVvUnEUtcrbB3KEysda9HGFZaIc/+Ak+krIfh04J8yH4kv1sp1InR0OKRvzja5uvVs/bOvRVkkALrPjQMCLfNBZEGs6rpx4LGFqFJlOnijIbljBhrmq/cZ6s8QF0J/eVdgHMOUgFNxBBfX2tYBULo7DPNSCUpecS0bF6oXiXCowsBDCqq/1MhpBubpc3HUPwuOqFhDIyt55DASW2qbWBNI0A6ZxFz94ANXZ6rgdEcXgo505fo67EC74ECP8NufepfVBfQs1MpRcjboVNhbwNsuyAzayLM/tXqqnCqqzjwByPnU0KprZ/k0m3zSM1BzwXOBCi4fruS1TH30Wxw/eZWyZZslOyyQvy6E0pzJlgU6AS9FNskIfxyX36zrOkpwxAOFDW+jeSzgV1e/9HIBfUEpGiYLGYqNhfNV0yLRzsvAALrYtz0yOqbtGhGrdIOBYrv5NmXtWKT3D5tZlENuH68iy7ECwLX9sGc8NHm53hy2ZcGtTmGfCh3vToqE/dXw6R22hlOH6W+1wyniZbGQaoxVOTnDhfJPfO3oOSvpfq5x3ZJ3b5kOy6gUl6l3+ldn4O762unT1HzctE1YJ1BD7YKloaR4xntzLTE4wbNwXtt08zpxYRTinwU/7T0Ol46Wphig X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NTZJU1NPaHM2bldxTVFWTnlyaU1CNHdmZVZQTm15ZXFsdlB0eWZobktTVTZ1?= =?utf-8?B?elVqemM0YXpGS0wxS0hwdDRpOEY1dE1Rd1VWZHpteFltOVliTFhsemhRc2Ry?= =?utf-8?B?M1VkZy9wajFmYituV2JsUFh6b3pmS3dmb1JsbE50cS9MblNVZlROME9qNmp1?= =?utf-8?B?WmdGU1hEUGNmZkFkcUdjMlc4SytXTElQcUd5d0FXK2RBUmxwRWpaQ3FVcGpz?= =?utf-8?B?R3gzVlBxb1BIaWxtdSt2aGljdmUwYzA4UWJidGdpbnIrSFZqZjEzdGM3M1JX?= =?utf-8?B?cVZwaHZZVWJhMGhnbitzdXZnK3FDZGhiSnNkb202RHZ6b25xbmRESkQ0SlFh?= =?utf-8?B?aXBBcVdIU3h4b1h5ZTNrL3lJaE1ldVR3bG9pUmpzYVZTTUtSMTU3aWhnMUpa?= =?utf-8?B?ZGhuMlMxeG9Cd0czWkRQYkx4UkxXbURMSDMvZHZwZUlTbjlnaWNZaW80bkJG?= =?utf-8?B?RHM5M0I3aVBNQnJ5UkJWb1dDNVcveXI1MWhZVlVjTEJSQ0N6RFBvckMyUlU4?= =?utf-8?B?QThsQkc4cGJvc3BZdnVQM3hXV1Arb2dRRmxMalNVdG9oeWdrckphUkJUaVpo?= =?utf-8?B?Ty9jYkxoN2FIcjhnNnRCRnVQdnJWUzVDelhNR2ZkaExHNVdMMjBBRDV1RDBw?= =?utf-8?B?U1BvVnlETzBteWt1VFlDN1Rkb0tqcWMyUjJ3VWxRMXd6b1VLMU4rdnM4cGE5?= =?utf-8?B?K0xMUHVPVXhQYVZicGJpOHFjcUwxcmdsa0puWVREWjFxNHA3TkpwN0dxUGFo?= =?utf-8?B?dXdwaGxuaUdUYkVwNVFRbGE5Y2N0MTNjbi9EdjVyM3hKOE9PZlZpMEU1VHQ4?= =?utf-8?B?S2VhQ0k4cjhoM1Vabm9UNDluZEJlMjNUOVM5NkFGOVk3T2FzU0RqMWZ6WUlG?= =?utf-8?B?T242NTE5b2NzcnBndHRUSjdkMXpFMUszS1hSZExJUStTdkh5bEc0cG1TU2ha?= =?utf-8?B?QXMzTHMrUkxUR2N4MlV0TURrWVdMRXlDbURwUlVxNWhlRW5WM1dhTmdJbE5P?= =?utf-8?B?OURNTzVtOVplczZoS1AyR3B0UitNemgvTHptcS9KR05zV3NGcnIzdFNVdE5W?= =?utf-8?B?bjZrSmhQVGd6aG5BWUxjY2RCcnV4WUlyR0YzYUtNb1ZvcFJwam0xMWlXSzlT?= =?utf-8?B?emIxVFlLbzVockYzTVVJU3lvS2pVelZDaU9QejRuYjVvWEMrTWFIM0FLU1Rv?= =?utf-8?B?ZUVpWm8wUXNzeXB2d0NXRUZyb2x2cEkwUDM2WXVJZE8zckNtL1FCWlpmQU9F?= =?utf-8?B?MDJQaVMzVG9Bb0p6UURaMVlZUVg4YzgyUmVGSDhwVlRwU2Rnc1VORi96RDRk?= =?utf-8?B?SVlON09VellOVmY2SEQ2VjNjdGdTbmg5cHpZU0QwVWpCdDYzZ1g0VlN1aDRY?= =?utf-8?B?bjAzWDdIMTRqVTF6VDVNTjJRMjgxTWFVYU9PVjVEY0t3Zk5qanVQZnF5TEU2?= =?utf-8?B?WW95K1FVWWQ4MjljR3FpWkpUWXFwVjFrWVlOanN2L2ZKaE5pU3ZOc2diWTk1?= =?utf-8?B?VHBxc3hwZHVib29NWGhvbmNoTko0enlVZjU2SG9SQ25YVDY3VUVOU3VkclNJ?= =?utf-8?B?b3Z3eDgyVzEvMnk5enF4c1QvTVc4cXBMWUM2QVhlYlY0Qm4vWi9DQ09mSDc5?= =?utf-8?B?Rk1oVmFnOFVMTThsdFZvSzRabExXM1hVSW56NmJYVVlQWm1BSG84NG93ZVFF?= =?utf-8?B?T1ZtSUNRVTg0QkZUV3pRMEg3blVSbUJHZWlTdHI1NitpazZuajM2OTVicHd6?= =?utf-8?Q?1XquqOqcEezmdWqu5W0JfjVTVrkgK9zl3RboDwa?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d76069ac-a332-42cd-50ee-08daad612c76 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 21:23:29.7605 (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: PR3P250MB0114 Subject: Re: [FFmpeg-devel] [PATCH 5/6] avcodec/mpeg4videodec: Remove always-true checks 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Michael Niedermayer: > Hi > > On Wed, Oct 12, 2022 at 08:06:22PM +0200, Andreas Rheinhardt wrote: >> codec_id is always AV_CODEC_ID_MPEG4 in this file. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavcodec/mpeg4videodec.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) > [...] >> @@ -3084,7 +3083,6 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) >> ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); >> >> if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 && >> - s->codec_id == AV_CODEC_ID_MPEG4 && > > should the CONFIG_MPEG4_DECODER check be removed too ? > This file is also compiled if the MPEG-4 parser or the H.263 decoder is enabled (hence if any of the H.263 decoder family is enabled); the former is probably done because of ff_mpeg4_pred_ac() which is used by msmpeg4dec.c (this is the only exception to what I wrote in the commit message; will amend it). The latter could be solved by moving the code common to mpeg4-decoder and parser out into a file of its own, say mpeg4_parse.c. I pondered doing that; would you have any objections to it? It would allow to cut down on the crazy list of requirements of the mpeg4 parser. Anyway, given that both the MPEG-4 parser as well as the H.263 decoder already require mpegvideodec, one could remove this CONFIG_MPEG4_DECODER without causing linking failures, but doing so would cause a tiny bit more code to be included in case the MPEG-4 decoder is disabled (in fact, ff_mpeg4_workaround_bugs() is completely unnecessary in this case). So removing it has a tiny disadvantage now and I intend to deal with this whole issue later anyway, so I don't intend to do it now (unless you insist). - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".