generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

id3v2: convert metadata after all the tags were read

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254)
This commit is contained in:
Anton Khirnov
2011-01-20 08:35:59 +00:00
committed by Michael Niedermayer
parent b3158f7a42
commit 189665d927
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/id3v2.c
View File

@@ -231,7 +231,6 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
/* Skip to end of tag */ /* Skip to end of tag */
url_fseek(s->pb, next, SEEK_SET); url_fseek(s->pb, next, SEEK_SET);
} }
ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
if (len > 0) { if (len > 0) {
/* Skip padding */ /* Skip padding */
@@ -261,7 +260,7 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic)
off = url_ftell(s->pb); off = url_ftell(s->pb);
ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE); ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
if (ret != ID3v2_HEADER_SIZE) if (ret != ID3v2_HEADER_SIZE)
return; break;
found_header = ff_id3v2_match(buf, magic); found_header = ff_id3v2_match(buf, magic);
if (found_header) { if (found_header) {
/* parse ID3v2 header */ /* parse ID3v2 header */
@@ -274,6 +273,7 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic)
url_fseek(s->pb, off, SEEK_SET); url_fseek(s->pb, off, SEEK_SET);
} }
} while (found_header); } while (found_header);
ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
} }
const AVMetadataConv ff_id3v2_metadata_conv[] = { const AVMetadataConv ff_id3v2_metadata_conv[] = {