From patchwork Thu Sep 23 15:28:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp567470iob; Thu, 23 Sep 2021 08:31:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuZGcoXWu9rx/JRlGe/WVMAKGQKrc+zBpxbDBpEP6HVetRZ6u1XI0OrxvJtymTAVntKMaa X-Received: by 2002:a50:dacf:: with SMTP id s15mr6196846edj.385.1632411083837; Thu, 23 Sep 2021 08:31:23 -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 f4si5481552edv.542.2021.09.23.08.31.23; Thu, 23 Sep 2021 08:31:23 -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=fbSKEG6S; 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 E659D68A943; Thu, 23 Sep 2021 18:29:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065067.outbound.protection.outlook.com [40.92.65.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1133768AC40 for ; Thu, 23 Sep 2021 18:29:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HE7vEybieJo9fQkBdvLNh01EPGSNe1iXYa3gN5EDHkOsaZyityMhNMUpC9Sf6TTqCn3/fAe9q8qqJs/dSrghe20EaE25ms2thRwTB+WAWdNCaAvmcUVA/sSzOf/WC3hU6vhlRHtSQ2Anzx7leT6tqrBNlWkkAJDk/rHdT5zEZAY2xj0c6N3CbXlEjYPwYwXqXhPQIqltp/PYJ5UTZOH4aKMtBCUdbL701v0SU7wDAI4vENw8NkNqyyRdd7z/BrUBIu2t+u9+TQd2dHyVsT6BBBpW8bu9PsIaIMxgzps+wk2H8EtcEPXDGb+xlddWrwfHL3tUjTYNZKtksq1HUar69Q== 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; bh=hlVqk+pvktn7SaEdoEFU4IhvUIhPDr04fIp//A0ElcQ=; b=SGn8YJ62pk9JTaVd2Ji9RQEYZMj4TerpCuoLqcAVOYTxU2786dapWeROosZutD5oZvv9zSGH2FzRiSxLtepIR8Z75uXhlpOoffO5/HBUFvziULLUQW436MeN3CoJGLjm5Sywsarnn+aEFXG8pkeZxcxH2Ag2xGNIPh57Dh1RUc9EWpKAAUj16SgApdnlTQmcbwipwhXF0s+fai+EOA2JHuuIMJpYyIC9QO0JVC6eHd2zxjnR/HhGMQWoL8rPIzugBPTWYRE6nd35hsepOnnD/hb5gN1jE9KysiNyFTLRi+KwZ+OovHWYMbKoEbdDptA7h0pFq3ZVmM8S8dsOrA+z0A== 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=hlVqk+pvktn7SaEdoEFU4IhvUIhPDr04fIp//A0ElcQ=; b=fbSKEG6SwNrhINjE3JFuF8dHrg/QQC90CrDsn7eLFVl1eQ3qYCkAzVsqEbhF+Wvcw6J6uydqXdDCehK49oyJLNpIrB9gN/2gec/HaMyLZWnlsCgbnQDFLyrwPX/9no+kcl+Movcf1M2vEpJt8OSS2MfPcHTLyGAACXMZ2fOiokdh/q81ELY4N4t51ww0I2Yhp7cje5uogs/naWpUHcE6v6fQhqkssh2rWBNo8VWELkToh0amcy1R2l1yIADZvsvEitjJqk/gT4AeRYlNyc0KEgixK8Su3YjaQ+vONiyAL1g/lwsApwrPdeZ3awZ890cdbkhg0dn0FGQQHFhn81gUZA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9wPhnVZgUZdPvJNan6uJ1N/nTpl/ouCH] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ce7a59e-ec46-455f-24f3-08d97ea6f2f9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSygBPrM25OmITrtIHMJgdStsLmNAtom6Xwo4pYYkVZ7Dk1LM8GzLKbb8Ds4cc4dkadmXmCEllguUaMd4opQhNEOGr9sKjW/v2anoTCLetB87zIMeq5J7NxKLMQrlGGEZztZ/z1kWfv/Ffx/OQC76x9IovKWWYQ/YBc5us3kLHzDmENUDaWzhn1d4JV7zdtJUUN20j4QMabLqaJnVLHJF43zJHGCMa31JnQn8cjDJGA5IuQXl8oYXA861YETXS8S16aN9DiehIdMLV+Yf31hL0N02QV0XqdxaiQ/kpG3UzG3XgYb/b5/Hg3dI7iPzIeH4amrnRZxupfHU8fmOumGGBo1kqGnWl0smnrDUMSN6SXqLIT8VsgsUZ5al0yjYhq4skGBnSP+AFC2vkNpkWWCvr/KXaickePBm4Nx0ZKQU8IzTlsob73RBSWJXXZrzAYEjMPXhvgcCWXM3rzeFTJ8naFcWTv0nU2+LDK+vduDpvYS+vQ+dvqrLTmVAet7XN1fqb/jpVnGsyPHKKs5tJ40PI8BfiBj2QozV7GzOnGrQeiOUBx0bQVThC0MpTLnuVY6S7Di48OhRkI5tckQEQYMn3rxC1pj/Zie+djVjMeaa86GO6Rj9SrvmXF/1Wa00qr5A0Ay3fN2IVrmTZIrNA1t4Sciw+YgMdiqMv6BgA63i/APfKrPQWqqZ1mqQpSMpJOqW5S13Ey/XfWwOsIx+burAWZG7FBLBOPG593KCv2uh6pCB8Y6xw2kxApwUCYnTTuuk4= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FXFdm8b6Jv9BzyK4PzZOvLQRJ+9b/mCNFmeTAd7u5wgCuioepajKZ2va1FV7EbFFAohzz719WehXJXOtTeqzT2nRFBJ1QMWufoGSal1p+3O1BS0eQ1lZy8shSU4R9q5BiPYRsia9PJu0zPRAz5EW8vbqZky4qqKa3CsNvoCY5Ejl8wN9lhp+LTfIbBEO6aiJuzdCmiPiLzQ+EDZdDQJn8a+a1MlOqB2uhW7qu5Dvp6MGXrTRdW75HAsKZwLj2g+qUdJckb2ZqG+9jMD8fzGJvtadnoFBY3icvSWsBG/oKWqWPDIMI56RAburLptvydr0PkdIytVhaC72Eh87T1thkdaCP0BdB1FuKk28tpqfCGPSFPB4jejxkvC4lA8R80U1DG0jB59KZU9JwoViB1p/pn4TTE+2XC8LaTyuKpvMuNT7RQ9na/YKeL7B1iZRZ4kS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2QK0AC9claI7h4/nneGXrI/EBA1hbv3JfCN57hgOenfbP7uevr9bKENBGamd/2JnS2KTj1OCcfGUmiafp9LEVXaRpr7oKzq0Ldc88nkuFM/atn4tnizEuIFDGLO2MBGc5U1c+Aopx6z4V9T5CjEr+g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ce7a59e-ec46-455f-24f3-08d97ea6f2f9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:35.7732 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 12/27] avformat/icoenc: Use avcodec_get_name() instead of codec descriptor 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: K2cfWS96sRZa Signed-off-by: Andreas Rheinhardt --- libavformat/icoenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c index 21966f3921..d684f67707 100644 --- a/libavformat/icoenc.c +++ b/libavformat/icoenc.c @@ -27,7 +27,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" -#include "libavcodec/codec_desc.h" #include "libavcodec/codec_id.h" #include "avformat.h" @@ -66,8 +65,7 @@ static int ico_check_attributes(AVFormatContext *s, const AVCodecParameters *p) return AVERROR(EINVAL); } } else { - const AVCodecDescriptor *codesc = avcodec_descriptor_get(p->codec_id); - av_log(s, AV_LOG_ERROR, "Unsupported codec %s\n", codesc ? codesc->name : ""); + av_log(s, AV_LOG_ERROR, "Unsupported codec %s\n", avcodec_get_name(p->codec_id)); return AVERROR(EINVAL); }