From patchwork Wed Sep 9 06:02:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22221 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 EE059449DDA for ; Wed, 9 Sep 2020 09:08:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7E3D68B821; Wed, 9 Sep 2020 09:08:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE67E68B63E for ; Wed, 9 Sep 2020 09:08:45 +0300 (EEST) Received: by mail-il1-f195.google.com with SMTP id m1so1216534ilj.10 for ; Tue, 08 Sep 2020 23:08:45 -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=1BsNJzanZR5KJCn+YNRcwnhWTPzIUsNf8J+XYABD5NI=; b=Wbesgb/9eLHFvxm2JsslgSVY/AUMRfb0uBgIN/4iC3DDbwLJBWXKKb1eWMcXWEq2Mv QwYTGRY+hsf2gT87hyUmippoiRRONU9RkSMDLNB+bbuaaCtLcp3WVSD3rXe8PglfAFgD 4n8pmV7XUj7xVlUh4+dp74Y8BRxxUracrfXmRra05mk5aFM5+8cCJxKmUtuQyhWzoiFj sr9qMUGH+FlyVqulTFRo/qYkJCSElGioXBRf0dxVtEOPScsoME5GW3+aDYCgQaHbdwmc YjC5sd6CnzQni7g8gKK1TyCdg6tFA2Bn2i0XjpkFoEuNg/BRr4QPeRsac+5wYEtw1IKX l8Hg== 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=1BsNJzanZR5KJCn+YNRcwnhWTPzIUsNf8J+XYABD5NI=; b=VYD/A6A7Jhm11evFXnT2WUIFnoroSoDoavwafPnjWn3pl2O07//lg/elcVWgZeSEX5 TV7e4keRYmYDWG8E27Wpyi/5RPd7QA5Had+FozDp9VN5pkYBH3yJ2hTLjDaQdnFQ57hH o9DpZxuXN7aEPfZJnaSFptDfsXPsBkAwLs2JgF9PSFVO1a4Krj5ZGxUkXF1GYK8d2VYJ 1tahzmTxdwes6KCKQKNvzMdZ2hhZHqxwKDfj1cVkZ24fNRddvD8iBs3fHAdNhc+J1q+5 /jKzwhTb16p4bHXDux0PXFV5XKoAVU2ewfjrp+cNFw105pRn1VFoAY7YzQTC2MxblWy5 QJww== X-Gm-Message-State: AOAM532MZOFVu48u0v8v21msYuC/JZ/g14wlB+n0r++QYOslYWOGJzNC 7ojBFAR9E+ZL2uroB5PRAVb5U666cNyd X-Google-Smtp-Source: ABdhPJx2rgtXkbklN6Ccmevb69Gye4SrLfDmI6KbGu/16gbzmZVutjffiAEl7vCOYUOq4Ka5vuO6Jw== X-Received: by 2002:a05:6e02:66f:: with SMTP id l15mr2266313ilt.234.1599631347859; Tue, 08 Sep 2020 23:02:27 -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:27 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:10 -0500 Message-Id: <20200909060217.25794-8-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 08/15] lavf/id3v2enc: use codec-desc-provided MIME types 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/id3v2enc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 5d821ea4db..a7f251652f 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -352,23 +352,18 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; AVDictionaryEntry *e; + const AVCodecDescriptor *cdesc = avcodec_descriptor_get(st->codecpar->codec_id); AVIOContext *dyn_buf; uint8_t *buf; - const CodecMime *mime = ff_id3v2_mime_tags; const char *mimetype = NULL, *desc = ""; int enc = id3->version == 3 ? ID3v2_ENCODING_UTF16BOM : ID3v2_ENCODING_UTF8; int i, len, type = 0, ret; /* get the mimetype*/ - while (mime->id != AV_CODEC_ID_NONE) { - if (mime->id == st->codecpar->codec_id) { - mimetype = mime->str; - break; - } - mime++; - } + if (cdesc && cdesc->mime_types) + mimetype = cdesc->mime_types[0]; if (!mimetype) { av_log(s, AV_LOG_ERROR, "No mimetype is known for stream %d, cannot " "write an attached picture.\n", st->index);