mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
id3v2: convert metadata after all the tags were read
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254
)
This commit is contained in:
parent
b3158f7a42
commit
189665d927
@ -231,7 +231,6 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
|
||||
/* Skip to end of tag */
|
||||
url_fseek(s->pb, next, SEEK_SET);
|
||||
}
|
||||
ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
|
||||
|
||||
if (len > 0) {
|
||||
/* Skip padding */
|
||||
@ -261,7 +260,7 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic)
|
||||
off = url_ftell(s->pb);
|
||||
ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
|
||||
if (ret != ID3v2_HEADER_SIZE)
|
||||
return;
|
||||
break;
|
||||
found_header = ff_id3v2_match(buf, magic);
|
||||
if (found_header) {
|
||||
/* parse ID3v2 header */
|
||||
@ -274,6 +273,7 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic)
|
||||
url_fseek(s->pb, off, SEEK_SET);
|
||||
}
|
||||
} while (found_header);
|
||||
ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
|
||||
}
|
||||
|
||||
const AVMetadataConv ff_id3v2_metadata_conv[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user