From patchwork Wed Sep 9 06:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22219 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 708EE44BC6F for ; Wed, 9 Sep 2020 09:02:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FEFA68B84A; Wed, 9 Sep 2020 09:02:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9724168B82C for ; Wed, 9 Sep 2020 09:02:35 +0300 (EEST) Received: by mail-il1-f170.google.com with SMTP id b17so1233993ilh.4 for ; Tue, 08 Sep 2020 23:02:35 -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=XWjnWmRBy2/NBs76N+hCFG2QNiZs2Qq6/EfTn9ujhoA=; b=nDtYN4DSq8+3cPKqfOo08V0l9kOt5Epa4AXwhdPryEowqL8POXx9kAcxPYo/cL+Mv4 gGX99x8iiPjTwuuWvnRiO4zsqExkogDf31anL7LoyXN3zZVR01RXigKulYFOoWUbDXSc pu+VSLxu3B+imSJuXt9n/dRYtAEQf6O6/uAG8FiGadc9a4lU7O8ZsDP1kR6/UwIqJWmr kchZ6/7XRZDmPNDzZMy7FBGQJ6lb9Ybqz9Q8Qxatf1jxwOd3eyI7uRyzxINOY2rp5Dmg Lxkw/XEnzsjtmbcDfCpxeFQtL7mKc+lMl+MbQQGgIockSEixoTFS2f29m7MXl6C+CU0Z uiYA== 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=XWjnWmRBy2/NBs76N+hCFG2QNiZs2Qq6/EfTn9ujhoA=; b=LH5ylwa9z1gBH6i7TWl27V4vWywl4DzEXJAKAkbmG1DaD3nWHhx3GbJSaEVIGH06iD IvtxHbvH1bQfsrLHEGgrREoQYObcs0TJUnjRur6XIx5CIUJQLDJjylWIKSK9sTB38JSs 9zIhId3w7owLiFVVETtREfFWfN5kf+3ySN7U18tlVHLA75f2F5ZWyA2rXjM61yN5+1Ci +kj6tVdgw9QwNbnAHZr29jZQrQVFCFJZTIvTTSa817nVCNGo1B43zZ2n0SvtgZUXKMVY QIaoE1fXESwvpzzZGL8SJAD0bSeSqi/Qse1CjFpl2oMODtfYcS2yrOm02t/yj5AQpvBh 7c4g== X-Gm-Message-State: AOAM531bqVaPIIOQQODzlQV/dxiiDD0wkqi3G79n+RaXRzt8N3g+n9Q7 3oHmOwQzc6zPhxkekNWNUH8R4w0mMHEE X-Google-Smtp-Source: ABdhPJz9ba+vVDRfL2VkEPuWnQkih2+V5kbACFxTj6zlrL+gI2llzNWnOOWatNaEbbqRhbxg6NYwtw== X-Received: by 2002:a05:6e02:673:: with SMTP id l19mr2273073ilt.225.1599631353843; Tue, 08 Sep 2020 23:02:33 -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.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:33 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:16 -0500 Message-Id: <20200909060217.25794-14-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 14/15] lavf: remove ff_id3v2_mime_tags 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" The ID3 spec doesn't list any particular set of allowed types, it only suggests using PNG or JPEG for compatibility. --- libavformat/id3v2.c | 12 ------------ libavformat/id3v2.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 72a10bd1e1..340b2fc60c 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -128,18 +128,6 @@ const char * const ff_id3v2_picture_types[21] = { "Publisher/Studio logotype", }; -const CodecMime ff_id3v2_mime_tags[] = { - { "image/gif", AV_CODEC_ID_GIF }, - { "image/jpeg", AV_CODEC_ID_MJPEG }, - { "image/jpg", AV_CODEC_ID_MJPEG }, - { "image/png", AV_CODEC_ID_PNG }, - { "image/tiff", AV_CODEC_ID_TIFF }, - { "image/bmp", AV_CODEC_ID_BMP }, - { "JPG", AV_CODEC_ID_MJPEG }, /* ID3v2.2 */ - { "PNG", AV_CODEC_ID_PNG }, /* ID3v2.2 */ - { "", AV_CODEC_ID_NONE }, -}; - int ff_id3v2_match(const uint8_t *buf, const char *magic) { return buf[0] == magic[0] && diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index a41fb271a4..8e9b7d95d2 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -207,8 +207,6 @@ extern const char ff_id3v2_4_tags[][4]; */ extern const char ff_id3v2_3_tags[][4]; -extern const CodecMime ff_id3v2_mime_tags[]; - extern const char * const ff_id3v2_picture_types[21]; #endif /* AVFORMAT_ID3V2_H */