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 9BC4843280 for ; Thu, 26 May 2022 20:55:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21C1468B584; Thu, 26 May 2022 23:55:28 +0300 (EEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2022.outbound.protection.outlook.com [40.92.18.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D799C68B39C for ; Thu, 26 May 2022 23:55:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LdPs2VUrowdVkFwZ6dG4gK0DJb2gmPXcOCn1RM1R97mqHNFbpOL/ABMaihny8/Xqi40JVlMT1Syu66LDDPDQTSGAp0PKjY1FTJ2Q+DRnbLgroCkErAjlZxnOfabInx0rtQ3MCTu5bTspJ5fdhq94F8+fFFuBkt502qEUuZCiYf8R+bwsbpWkZsJxhguS2GixWUJLIam0fU/KybnTJJlNqG4MLZolIakLlCdx52MnMv1WVQXXzHdYwjYpcIZbw7xdR86NSpNeLVgzo98nHPP9XmfhUrWk0bbk0prN/WWeE5mnyqqcbe1YgoZH+fkPcWVk3oLmG4REUpsQT0o1bvE3Xw== 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=2GOfAyMlvgfzQSIxHSmEWYt9hSI6hAGr2/EuQ/rUmGs=; b=HHMdQzWQnkVUcPYUiRu7ge8dNFDncRyZi5kC2Orm9FwkcETsoAL3s/ZSn0pUKFQEF6rDT+kzPAO4f4wr/JEx/rqnqr7hiEvEOeM0cbCnaId6Qlvk64YtoZZkYQKHoQS2R+6XUxq/wcOHMGM5tn5fNTcWcednya58eOJWW+v7YduR2+RjOE9OPf9Lq7NbDd2v4b7zt7pVuvhJ9yCSBPlZ5Q/lscbGBF0CmoaT3U0kYJSHvx5H7Oyh1H5pVu9ceuFacgl2JVUlipXtfe6NPDkKSlMwWMx0NJLkZrFKMN7sED5AaBr8g0fT6oLABKlQFIvf8MExOLLgBDvDq7Qy78wRzg== 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=2GOfAyMlvgfzQSIxHSmEWYt9hSI6hAGr2/EuQ/rUmGs=; b=OrSb5ky0kT3RL25trD7eqtD/AKIIWd48N0Apcdkm3r7oB8cCyllUpXnldza5A807NHj4WZHnQWJ3+/E825T537VxWtbRC6jOKhOSj4exiYamkMUaRSsqZoliA6IqahHbuIH1aWSB1yHpG8IsOF86gSS/MIJv3+EM7JLHO4UbPVnMiLywkE08ET9uj+r4HfPwpjsrOPLyPbZ05Gt6dDQLEob1kWIOgPkWlYCSMPw5z9q1veLyoOTAtjIF3UsnnKJl22hiURQ6UxI8qFq8uH5sLAAUXjciIZf5a4qWz6in7kTzmD/nPUJH/VXfm8RKE0vhSX7uAdNALvA+6tRB9vv48A== Received: from CY4PR0501MB3730.namprd05.prod.outlook.com (2603:10b6:910:8e::20) by BL0PR05MB5617.namprd05.prod.outlook.com (2603:10b6:208:68::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.6; Thu, 26 May 2022 20:55:18 +0000 Received: from CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::fdd4:f092:691c:29d3]) by CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::fdd4:f092:691c:29d3%7]) with mapi id 15.20.5314.005; Thu, 26 May 2022 20:55:18 +0000 From: Eric Juteau To: FFmpeg development discussions and patches Thread-Topic: [PATCH] libavformat/avformat: Check codec whitelist Thread-Index: AdhqOdI4IVULhS6qSdysUd8K5QPgKgHCO4/g Date: Thu, 26 May 2022 20:55:18 +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=608ac5dc-7a35-4be1-8a24-c9c32e64b152; 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-05-17T22:07:58Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-tmn: [Vbr4fwL3GaJaiHnlsoBEW78J59OKNTvg] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c952e393-4c4e-4af4-ea37-08da3f5a0a8d x-ms-traffictypediagnostic: BL0PR05MB5617:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: a2iwOEODcNsNXhRWH40st/18izme6swWYjJ/8zSLmhwoJ+iSWtY/g4ZcXLQv7NdzjGYih2fzGB1y2PgFVy+tGieTC34jOvApF6RoJxls2zwcobrJ5zez1KVmAhFc91gJUua3R6AWCq6MESmR2iURmdSPFygaKMuO1QiqGind05yE/6O2dmMBl7i+Uc8/aKm8TDduS+YhT+JRuGwxkEsWYtJw9TdB8bFfUSjA4tnJbF1dZ3+BMLKbO/95hFt2jAuBWBVE8QyotQIAQZrjPUmZpIkUs0VWgUm/yxc3fR3HOoJVTeRTHNChWCFzAQJ28sluw7Uo7fE3Ez9Wnlbh967xdLbJ3bNTflHphgOkp4HR87WKJvTCfUxBRecEphyM/Yr6pY89PoMKwYV/kadh+ea6yhS/6MThMqTlxrWsGeGiGxHmRQJAZ/3GRL2dhzTaREGiFYJtM6NgLJcYI8NQwJzbMUycCM0E1ntwRGUAUFCYeqqvozOoB6dOi631erlPWrUIS0qjLZBfjhXNxwWBGcUVXdFryEUzGz5FY9h2AknkQAxNPu7B8PcOS7vsL74ZyKMeapCPgAqs/525XRsgPTlRNufhDoDqUbBIpIitk+SbJYqgJKH0vK7WWNtNqzv6RT4x x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?UBI7dIP3sciYABHHdvBMyGUHZCEe4AckIWoIfqialQZHxOL90XgaT/BHQtcx?= =?us-ascii?Q?07Wfikr21njQWuPJrDKaAEmd/quXSEA5zJEyYEvuvoQoLjDkH+xJCnkzwr33?= =?us-ascii?Q?Zqb3GGJ1Gt6s2cUGjAgcaKgdoS3Sn2w97K8XRa2uk+Ko3JyTi/Qkzy5bassL?= =?us-ascii?Q?cPBO3kyjHwEd0ZhkhnV2Tmh5HmsHVm6S3IcllcBbfEsflYCvvJh/O4p6vAYb?= =?us-ascii?Q?7Ja5Mk7gK4XQg1+h+Gbs3OkQV28fNowuBYtJnDKskbRfoOeJzUOWokNebjoX?= =?us-ascii?Q?nlsAUwYEHR37m5bNBCRicAT6sCAKMVYDDxvZ0MLogSbHz+bcwNUefVDDeFLX?= =?us-ascii?Q?97n0SZLKDN3cIzkDXVuLbjeF26xrD9zZDYPUMAVz1tMu246bI+LeYXdRZJpN?= =?us-ascii?Q?5tdpLxe+5CwsKI3+SKB6jR53d7cT4LOvKj2LStxkXWnEWTHE+EXw5Co02cKA?= =?us-ascii?Q?lg8vgG6sjjugA4NEKH7iP9ElFeYyKOrU3J/GYbkRR/x28ThDthpyo8R3M6En?= =?us-ascii?Q?DtwZ/h6WmxnT1jlFYx3O1BNts9x6hkywk2s2hiNrfekABzGyszXl5FwUQPIk?= =?us-ascii?Q?BRZUJzdfMqAx4QDrSfo07ocareU+89E7Aqq7UbMw0C68zHLSTiQbivuOSdna?= =?us-ascii?Q?E7BTvfEOWsHlgxENAqa97aNl1GAwQdWxv1s4dsQjGL5kcQiMBIn8uC4NyJWg?= =?us-ascii?Q?et2SgrC30R8CYENA8ZXy49gkieVK82Hsut3JqlztUtoR+I5T3Ly6dEsLpF4E?= =?us-ascii?Q?6SeaaTuN/Lz5E2e9wjTCr473/BF2gpRblat5eH0M/qccRf9j08q3Z4LesBuR?= =?us-ascii?Q?kv8qU795jfJCX0S83ufgdb1jfiWJ6Hi+XosoxiTSkUPqj/4ovTCCNfKD+mXa?= =?us-ascii?Q?BPCNVHn6zfbZ6+SbiR4dl7+vYOfq52o/E1dc+OyBrWaz0DJLJSV5x85U6aFb?= =?us-ascii?Q?ApN/+9HG0szXkn92jYoVAL8GVWizusNWw/W69Y0scKfdIOXk2TR0paaOE0Hy?= =?us-ascii?Q?ji+z/o8IlvntmoRGmz8VVmcet/choSjiWuiOAruYmRPLcyxzLDmJM8sJA6+Q?= =?us-ascii?Q?PspUy1kDuoDmjOH79lXzcvwfusB+MP4ocKqw+IxKxFUBkLA2mdwEzgbK0/Xq?= =?us-ascii?Q?Z5R2QCtDewXSiChSGZlCVxcuaZ8EOwSXdda1TjQUjuEuKprWvOEeLojmoX7K?= =?us-ascii?Q?aBb8A9HEf0BOmdju+5XlWI6OB+lpZ/ASzB+Kz43GYTiDfriVG5WjrpcX6BTO?= =?us-ascii?Q?vd2XOub1dU4MYdA79Wh5LtEavj+me2F/P9gZhmcRDM09CNm8NqKi79tZ6REo?= =?us-ascii?Q?8QcE5MX7vYvQ78O8S+QQH+GRjer+lijGJv9RjsCL8xjw8Pv82yppxAFBGkEF?= =?us-ascii?Q?5sKe9sQbdXbZ16vflhLmiRduRZ4x67boj/itaL4jau+zSGTpXw=3D=3D?= 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: c952e393-4c4e-4af4-ea37-08da3f5a0a8d X-MS-Exchange-CrossTenant-originalarrivaltime: 26 May 2022 20:55:18.2869 (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: BL0PR05MB5617 Subject: Re: [FFmpeg-devel] [PATCH] libavformat/avformat: 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 this patch. Thank you in advance. -----Original Message----- From: ffmpeg-devel On Behalf Of Eric Juteau Sent: Tuesday, May 17, 2022 3:09 PM To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] libavformat/avformat: 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/avformat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 30d6ea6a49..396c1affa1 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -376,7 +376,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.17.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".