diff options
| author | James Almer <jamrial@gmail.com> | 2017-02-10 01:24:27 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-02-10 18:33:29 -0300 |
| commit | 84d874a680ff647bc84de44967b638f246a8b832 (patch) | |
| tree | becb9a8bc52e046926c0d368cab60505f82075ad /libavformat/apetag.c | |
| parent | e8d6fef3161f35878f8e0abf9d27d2c45a5d40b6 (diff) | |
avformat/apetag: account for header size if present when returning the start position
The size field in the header/footer accounts for the entire APE tag
structure except the 32 bytes from header, for compatibility with
APEv1.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/apetag.c')
| -rw-r--r-- | libavformat/apetag.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index a05b32d9e5..b23f8cdd1f 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -150,7 +150,6 @@ int64_t ff_ape_parse_tag(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Invalid tag size %"PRIu32".\n", tag_bytes); return 0; } - tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES; fields = avio_rl32(pb); /* number of fields */ if (fields > 65536) { @@ -166,6 +165,11 @@ int64_t ff_ape_parse_tag(AVFormatContext *s) avio_seek(pb, file_size - tag_bytes, SEEK_SET); + if (val & APE_TAG_FLAG_CONTAINS_HEADER) + tag_bytes += APE_TAG_HEADER_BYTES; + + tag_start = file_size - tag_bytes; + for (i=0; i<fields; i++) if (ape_tag_read_field(s) < 0) break; |