summaryrefslogtreecommitdiff
path: root/libavformat/apetag.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/apetag.c')
-rw-r--r--libavformat/apetag.c6
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;