aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammad Alsaleh <msal@i2pmail.org>2012-08-07 21:31:51 +0000
committerAnton Khirnov <anton@khirnov.net>2012-08-08 11:20:45 +0200
commit385ec296f1b39a2f49d1e897a2606c29da173f6a (patch)
tree85f87f4a7e3ceac22f662fe38b3e9d5f77fc57b5
parent1a4b55678665b4222766db8ef116256abc3fd013 (diff)
downloadffmpeg-385ec296f1b39a2f49d1e897a2606c29da173f6a.tar.gz
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>
-rw-r--r--libavformat/id3v2.c2
1 files changed, 2 insertions, 0 deletions
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},
};