From patchwork Wed Sep 9 06:02:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22218 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9AB7B44BC6F for ; Wed, 9 Sep 2020 09:02:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88C3868B83C; Wed, 9 Sep 2020 09:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B51968B825 for ; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) Received: by mail-io1-f44.google.com with SMTP id r9so1948519ioa.2 for ; Tue, 08 Sep 2020 23:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vqSRIxLLutp0qjIZyh1NCsa4+pNlH+IvoYBLcn3vu1o=; b=crhwgsngdPMuj5IDcGhSaHU3lSsVacaQ1TbkL2Fr90bxCczIx/D+bjphtbwxbc2exe VhMy+yfOANxUoy8x/DuNyJchcg26xY3GjxNxK5DjOdsz8WrZvPW03G6IzOOnMYO8355A 27y5T5Oq4IC2ClEscfBLdgZl9BQj92Kl0BKqIg46wHmjsmXmmF9msyk48mVodOA+itfx QDfEIBbaivFFXWrb+SMHn9SY+sRGowkZuJYugVqQ3B59fNn4otziDW3QzWJsKNrdUJnH Mj3iJdPWuQUhAOWLBsI9El3k05e0H8N13U8TtZPQL9yQvXdn7N1ljfkzAvFR59kdrA9G OjXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqSRIxLLutp0qjIZyh1NCsa4+pNlH+IvoYBLcn3vu1o=; b=dfJDf9hIJnMV+cdY/KQ/GrMV80Qg2Mg0lbd3Edx54FcpZlLbbZJcZBJKxonTQvnto2 c6GlGk8SndGU2+qibmWS2vmCZvcmq1fribCIMFaCUD3OCVQVvt0ut828hhiDjE5OuKQc BRDzGh0AjikVapAKdtE9RixVtDuPDoQVbgKQrXT+bfqCjS+S6ezpS3aEecomseoYUV3c NCM5MayJ9UnrhmZRNh0+rmCsB0sfRWqEfD2bW4xe4gQB2H0hpXtN055ktf0ff8Rz3Fjt 4aaSiSZn/tSC18i7buImYS+YbhL5a4OGCmytbvHrUI2tvfje5Cqen2iX36PzWfv1B8NC 8yEw== X-Gm-Message-State: AOAM532K/fvPFTu2Y9aVzX3c7nOiJvU9eT77FB7l7jOO3vf4XnXNBtDY TsIMvjhf7yMOpJ7QkzdDVl5bQ5tSjrOy X-Google-Smtp-Source: ABdhPJwzQkxmo+4Ggxcgd1lEU8O9NixsTdJgLvoJMrtAv3GP4zxi6OuSKJoWwIBsDdzE4gEVWz9dYA== X-Received: by 2002:a05:6638:dd3:: with SMTP id m19mr2733910jaj.115.1599631348736; Tue, 08 Sep 2020 23:02:28 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:28 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:11 -0500 Message-Id: <20200909060217.25794-9-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] lavf/id3v2: use avcodec_descriptor_get_by_mime_type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/id3v2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index cecd9b9f6d..72a10bd1e1 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -585,7 +585,7 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, { int enc, pic_type; char mimetype[64] = {0}; - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *desc; enum AVCodecID id = AV_CODEC_ID_NONE; ID3v2ExtraMetaAPIC *apic = NULL; ID3v2ExtraMeta *new_extra = NULL; @@ -614,13 +614,9 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, taglen -= 3; } - while (mime->id != AV_CODEC_ID_NONE) { - if (!av_strncasecmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((desc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = desc->id; + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_WARNING, "Unknown attached picture mimetype: %s, skipping.\n", mimetype);