From 385ec296f1b39a2f49d1e897a2606c29da173f6a Mon Sep 17 00:00:00 2001
From: Mohammad Alsaleh <msal@i2pmail.org>
Date: Tue, 7 Aug 2012 21:31:51 +0000
Subject: id3v2: Support v2.2 PIC

id3 v2.2 uses image format ("JPG","PNG") instead of mimetypes.

Currently, the attached picture is skipped because the format string
does not match a known picture mimetype.

This patch fixes this behaviour.

Signed-off-by: Mohammad Alsaleh <msal@tormail.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavformat/id3v2.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavformat/id3v2.c')

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 7a229d20fc..650dd596a4 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},
 };
 
-- 
cgit v1.2.3