diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2012-09-25 16:49:36 +0200 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2012-09-29 15:39:55 +0200 |
commit | 341e2c46ca841c6dd68cbd6a1a07977bf5557784 (patch) | |
tree | 22e580fd8254dbef4f06384d0adc93562bb8b240 /lib/rbcodec | |
parent | 270d9eaee80c96d23d249d05b6d11eca8381486e (diff) | |
download | rockbox-341e2c46ca841c6dd68cbd6a1a07977bf5557784.tar.gz rockbox-341e2c46ca841c6dd68cbd6a1a07977bf5557784.zip |
Support technically invalid image/jpg mimetype in tags.
Although the mimetype for jpeg is clearly image/jpeg, many tagging
applications seem to use image/jpg, so we'll support that too.
Change-Id: Icb9063fd5a9d8aea169eaa7f74ac52b72603d148
Reviewed-on: http://gerrit.rockbox.org/318
Reviewed-by: Michael Giacomelli <mgiacomelli@gmail.com>
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Diffstat (limited to 'lib/rbcodec')
-rw-r--r-- | lib/rbcodec/metadata/asf.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/metadata/id3tags.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/rbcodec/metadata/asf.c b/lib/rbcodec/metadata/asf.c index b88b8e77fe..469a5739d2 100644 --- a/lib/rbcodec/metadata/asf.c +++ b/lib/rbcodec/metadata/asf.c | |||
@@ -493,6 +493,10 @@ static int asf_parse_header(int fd, struct mp3entry* id3, | |||
493 | lseek(fd, strlength-32, SEEK_CUR); | 493 | lseek(fd, strlength-32, SEEK_CUR); |
494 | if (!strcmp("image/jpeg", utf8buf)) { | 494 | if (!strcmp("image/jpeg", utf8buf)) { |
495 | id3->albumart.type = AA_TYPE_JPG; | 495 | id3->albumart.type = AA_TYPE_JPG; |
496 | } else if (!strcmp("image/jpg", utf8buf)) { | ||
497 | /* image/jpg is technically invalid, | ||
498 | * but it does occur in the wild */ | ||
499 | id3->albumart.type = AA_TYPE_JPG; | ||
496 | } else if (!strcmp("image/png", utf8buf)) { | 500 | } else if (!strcmp("image/png", utf8buf)) { |
497 | id3->albumart.type = AA_TYPE_PNG; | 501 | id3->albumart.type = AA_TYPE_PNG; |
498 | } else { | 502 | } else { |
diff --git a/lib/rbcodec/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c index 0e27c0305b..3d1d7e4d71 100644 --- a/lib/rbcodec/metadata/id3tags.c +++ b/lib/rbcodec/metadata/id3tags.c | |||
@@ -320,6 +320,13 @@ static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) | |||
320 | entry->albumart.type = AA_TYPE_JPG; | 320 | entry->albumart.type = AA_TYPE_JPG; |
321 | tag += 5; | 321 | tag += 5; |
322 | } | 322 | } |
323 | else if (strcmp(tag, "jpg") == 0) | ||
324 | { | ||
325 | /* image/jpg is technically invalid, but it does occur in | ||
326 | * the wild */ | ||
327 | entry->albumart.type = AA_TYPE_JPG; | ||
328 | tag += 4; | ||
329 | } | ||
323 | else if (strcmp(tag, "png") == 0) | 330 | else if (strcmp(tag, "png") == 0) |
324 | { | 331 | { |
325 | entry->albumart.type = AA_TYPE_PNG; | 332 | entry->albumart.type = AA_TYPE_PNG; |