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 B7BD640794 for ; Tue, 1 Mar 2022 19:03:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ED7668B194; Tue, 1 Mar 2022 21:03:45 +0200 (EET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2086.outbound.protection.outlook.com [40.92.22.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A211D68B176 for ; Tue, 1 Mar 2022 21:03:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gK2/194kABp8kx8uNPr1I170TFlTXxn03+iwunJvSoKi7YBU2lTgYRzQmlnVJsJrAtkSJY02Uj//BUAq17C618F7zqtEQlgTMqLlwr+qgRA4CJQmhzZ3CUOZBH1/wWml9jtlplQVmtJcXssPU1CHt94vLnmb0oN9hMeMemKe0/dilE8Rj+NQ12PeIahBTYy2fwg+AU7V7XTSWE1fwEvkTxfLWlnO7fwDUflPIWdcijId8AKjPx7Pc/iE8JUOT8e+nt565Ioqk5778I+tCfGFZgLchCsDMsLjK3iDf16das5c4BCnRFcnHqScTn/Htm23fwH74c53K9woo0POfNMS/Q== 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=rGcctqv8jeiIN7YIBFMyjv20jM9WbQ7I7+AIRxaoHos=; b=j3t4EL3Qlv73zhb71DgemAm+IQNW/oGgwTm92iFnTaRNMEbRk1//4KORYUZEgkzLpmobYk4OagHIOkMq2Iaz2CDRevdY6lmLATDra0RnMuIrnDyVV42V03mCQhay92twJAfzPvOxc3hXFWujOg2IOswF7iMezT8wXlUJk+ma+IZszNM3gN5CIDLiWjmd8Htj1PTBBi3JuE9npqGmz0FEfU7b8FOr5HmKbFypwSNpkTFvc8q8rgNDhaWBUksuIGqnRaR2Txd/yauEpALDHJe8XbYB4ZdPYckY0C9twUjqSu6E2wWHoFAOf5ZTDyu2nlFBgjPWq3cn/27Gj17Qkilu3g== 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=rGcctqv8jeiIN7YIBFMyjv20jM9WbQ7I7+AIRxaoHos=; b=l9Iyjm6iNPZjf6hpvepnjaV5x5weHh/eVkt6D92d/0bH7Ac71e7K0HRiGBVfQ+eVTU00tXJW47rYA9/d6eDO4wna6h3Z61jfFQmz03aTmCiEETQJn5fLU2kABvNSZmfQ5Ydho1L9AtXY00sai5yoSozdT5mK9bE8jR9Mx4nz0nYRTmE/N6HqE6Do1Vr8ee1Wlv/r/9rXU5GuQym9Hkn49YHZrp5sm/zZWNXr9wK4O2Xyk+cGIjZB3hvNzVbj5GrThkcxGKsoGfQWvtmafEWDmZ0DgTJGlr9CHqovkQjQB2Lvc9KJkGGCVzX6ADTAy3shwa5tLSUTQGfXS5u3G0WwYw== Received: from CY4PR0501MB3730.namprd05.prod.outlook.com (2603:10b6:910:8e::20) by SN6PR05MB4126.namprd05.prod.outlook.com (2603:10b6:805:18::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.12; Tue, 1 Mar 2022 19:03:36 +0000 Received: from CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::fc9f:333d:bf36:c51c]) by CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::fc9f:333d:bf36:c51c%7]) with mapi id 15.20.5038.013; Tue, 1 Mar 2022 19:03:36 +0000 From: Eric Juteau To: FFmpeg development discussions and patches Thread-Topic: [PATCH] libavformat/utils: Check codec whitelist Thread-Index: AdgTIPxJy79gi2dDTTiaLzCKdYJjmwOzObaA Date: Tue, 1 Mar 2022 19:03:35 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=763db800-91dd-46ef-aa01-77ed6a86b69e; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2022-01-27T17:05:35Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-tmn: [4ygIzCzjsLoOG0D0xo8qFIC/uVHXQpZ/] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b8cd1f5b-bda6-465b-d7cc-08d9fbb6302b x-ms-traffictypediagnostic: SN6PR05MB4126:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wIJpPBwumIaXjeetUc9yBV+MzYBLLv83j3AkeVIL7DKajxFt2NPdKQEfz1faMGC+p3CG4JlZkcWhCPfAQ+BdohnHQu+C7vNjVsGbXlEr315KcUQzk+tabRPQk7Q9N7/tJTJ6XBS0sD1ruAJy971ZzEmaahk/VX5SN2o+WZ/R3Ny/fyMN2qCqa0xGoyWGuSvNucoReE9+mNMFXnA8BtnxpyJ1aYhJgEE0sKKnrARTy5ictLuhDWGSny8tdEjtQ3t7pVn+//GTA18hZb8AzxSaP2nXfox6j34kM+7vp5X9y9yZS5y9yg9QDjgJz+YLpN+RZ0+kd6hRIPopONk9dM4vkkpnhMH3MWPLF4ncoiHDH8HZ/VOnCEde85YF3MzDLwsc9AJPZsUU/btLLqW/rIGIiIRjjmHrX/cOLIv3yWaJIDOKfyTiqQ53gPshPnycTgw8CX5o8E5Fdck5gzZ78w74+V7lbm+Ki/IA5tVkEjQFRYhj2AX6GzBtZ2KYs+QvwS2HjVh4HM7ao/V5bjbXVPf+y2GaXU6yepyK79AVWtF9YVwbKkCnhiD8xxPG1YKoh/JXMUM5Iyxf5JS1z1VPZEWUq15RpmbYdA0AV21xEvw4Ro453lMpahsyZkDRbIdOWj5U x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: eFnIhtZxbozrxySvQVaNjp6iDdhZQosxhBFMtXIJJelZjOMtXJqs8iSTV6mbr6yV8qz+wulszOWsSEZzWJNK75cUNmVizVEiLvw9A8IhvKRkWNnZ52NPlgucsSoDVZd5LUuKMLS4AQEUkI7kwcBwhKrzBhuEM/szGPqljHBMy/EZz+H3pQkVt+ySeE4NBuXV8rato5W7gWqhbYHkSPaHeNdZyaW2IDpUKMkVeNXGCc3Cr5UImAu7N1Awyb1JMTw+hAkr9283xGchMK1Ns1RO3Kcb1wflNVaHbsLL8V/7xVrnbZ+vj5DgS3N7Pu1QnZAWPv9MjmGOOPCbqXMB1cXlRDj4DXC3aKMIkgHdKsv0kDaXsLf8t5G0WWLGhmZfTtUd7jnlEG7112I5VVaaLczkAQM0f/XRFTrpwfn1prrGLC57ID+tHlWPHztkBHs5UbduGQF6xAYj1tmqc1T3fBfigMQvN6sZXj/fr2h95YT45ZXvhv2Iy4zpzkDh50a8RjP2bQGxi8MkHtUJLLnWyNShfgLLr00MADVhoPp7JSUvn3dloxnjssyrtEqtwupmmJIR8gReI+cSUk+C5rCHVzwrM3cvh9dIn0UsgmAX86rQBKtedhCFgQYrNZQkutb9iYz5fC2ZtPeRzsZB85E5WFgAGhTc3/I/HQcUHKUKEvBm0OXv4df9muiDfXG8AbXCrjH/ApBAtAFiWNizccqfYdpn9Y582WHoxRdQyQM1I8KJpo/5lI2uowdyCH+c7cpvc1V60B6hqk3fvdl2noGny0w9poQa4eLJcN9gBGiIiwjnfQpzbg5plQ7JUcEN6CdsEuQXDIRC+OUfjfP0rrzgSTggWBCM+armTD1peT6916nkkQ9gCmTpGaScuaXpbkmaIeQzGcOEwZ3Ju4fLZ7xcbgD4r8K2gVa51rkZQE1XROLtGY2McYGpfDJGz7nJqniEHa1U MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR0501MB3730.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: b8cd1f5b-bda6-465b-d7cc-08d9fbb6302b X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 19:03:36.0122 (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: SN6PR05MB4126 Subject: Re: [FFmpeg-devel] [PATCH] libavformat/utils: Check codec whitelist 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: Friendly ping for feedback on the patch below. Thank you. -----Original Message----- From: ffmpeg-devel On Behalf Of Eric Juteau Sent: Thursday, January 27, 2022 9:06 AM To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] libavformat/utils: Check codec whitelist Modified the function av_find_best_stream() such that, when a list of allowed codecs is supplied in the format context, and when the caller is requesting a decoder be returned, the function will select the best stream that has a decoder in the allowed decoders list. Signed-off-by: Eric Juteau --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index e643821fc9..5a96f16c0f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -529,7 +529,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, continue; if (decoder_ret) { decoder = ff_find_decoder(ic, st, par->codec_id); - if (!decoder) { + if ((!decoder) || + (ic->codec_whitelist && av_match_list(decoder->name, ic->codec_whitelist, ',') <= 0)) { if (ret < 0) ret = AVERROR_DECODER_NOT_FOUND; continue; -- 2.25.1 _______________________________________________ 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". _______________________________________________ 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".