From patchwork Wed Sep 9 06:02:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22222 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 21BAD449ED1 for ; Wed, 9 Sep 2020 09:09:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 092A268B847; Wed, 9 Sep 2020 09:09:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F8F068B844 for ; Wed, 9 Sep 2020 09:09:15 +0300 (EEST) Received: by mail-il1-f196.google.com with SMTP id a8so1261129ilk.1 for ; Tue, 08 Sep 2020 23:09:15 -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=9OpXqfS6la1ks+geJcz33IBMhW2kpxGadZk7RtwkxHE=; b=PqbOefMCWFpAtCt/Qx7/6IHKXkqXg72b5q/7Vhy8yM2ChiQjrQhZmj+I9S3uFPxDOP opg9sqveAlIehLgj/buBHX/ULgBvinnv2e/HRWVYh+/dEkNBpO1dD+cV+vT+v7ElxFqL Q1SYnUNQQccKiYrwUQ8nAdCPvjJ46uR3cgy/GYuCfT6t5d4NtXYU7lRr5WYfatPC0sB1 LppP1g/4gOcj+y9QhJcLV3fiZVf5EX7ksz/WF/1wxlEVBz7OVtpjV7quH4reDuGfBRf6 tcDXDVAYPD5Il/3OmW0458G6+IN3D909V9mUEYs/VsVlsS8/j4rIOdaEahVUhGWOZD3e KzTA== 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=9OpXqfS6la1ks+geJcz33IBMhW2kpxGadZk7RtwkxHE=; b=psTSL8imrrY8GdvhVdBooe2plP3IfQ4PJpaRBS7bS96lDwMVCHweD+4ywbqmI4UtQv Mz0Qfd4RaefOW3eThQj2qGfv+CTe4KuP9UN7VTEWDV66RrY0Cb8Ofe+16+fVrUvnXfxw B1i1pWG5LkweA4DyglZFYC1RXk9ycR0nnHq614vrclMndaZ8CbG1oP4Oq51cPgoYSc6/ Lok3+hesQExfdVJ5sY0e3H+OuLko6ozZrlCvXqeiDhm4lukY+elMUa0XfAljEnXdPWhU Rb8cY3HjeanBi9oZSFxtApzjx7omam6w8PGiU6SYfQqkvM/hgPdUMSLExlHEnKNJgn2J HG1g== X-Gm-Message-State: AOAM53104XyE+piCo51UepxGGhNaT6/+4/jkGg+DRKuLJYuuSHqukm9q tMXNF+nlRQoBcKk0IyUsj+XqM3FPZH32 X-Google-Smtp-Source: ABdhPJyuL/3Ja5UA9vj1bZxKXHYa2qYpFWBSata6p6m6qqN/d1JdM4xSPNs7mYJm6v+0aNTn7gKUGg== X-Received: by 2002:a05:6e02:cc:: with SMTP id r12mr2102033ilq.122.1599631349708; Tue, 08 Sep 2020 23:02:29 -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.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:29 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:12 -0500 Message-Id: <20200909060217.25794-10-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 10/15] lavf/flac_picture: 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/flac_picture.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index 53e24b28b7..3e684b58a3 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -31,7 +31,7 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size, int truncate_workaround) { - const CodecMime *mime = ff_id3v2_mime_tags; + const AVCodecDescriptor *cdesc; enum AVCodecID id = AV_CODEC_ID_NONE; AVBufferRef *data = NULL; uint8_t mimetype[64], *desc = NULL; @@ -78,13 +78,8 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size, int tr bytestream2_get_bufferu(&g, mimetype, len); mimetype[len] = 0; - while (mime->id != AV_CODEC_ID_NONE) { - if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { - id = mime->id; - break; - } - mime++; - } + if ((cdesc = avcodec_descriptor_get_by_mime_type(mimetype, "image"))) + id = cdesc->id; if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype);