diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 7a229d20fcefd4e31630f70d5eb380586907c341..650dd596a47032c14793a3a1de659706ce5276b2 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -118,6 +118,8 @@ const CodecMime ff_id3v2_mime_tags[] = {
     {"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},
 };