diff mbox series

[FFmpeg-devel,14/15] lavf: remove ff_id3v2_mime_tags

Message ID 20200909060217.25794-14-rcombs@rcombs.me
State New
Headers show
Series [FFmpeg-devel,01/15] lavc/codec_desc: add MIME type to AV_CODEC_ID_TEXT
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Ridley Combs Sept. 9, 2020, 6:02 a.m. UTC
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 mbox series

Patch

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 */