diff options
| -rw-r--r-- | libavformat/apetag.c | 6 | ||||
| -rw-r--r-- | libavformat/apetag.h | 1 |
2 files changed, 6 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; diff --git a/libavformat/apetag.h b/libavformat/apetag.h index cf2a5f8ab4..49cd10eb01 100644 --- a/libavformat/apetag.h +++ b/libavformat/apetag.h @@ -28,6 +28,7 @@ #define APE_TAG_PREAMBLE "APETAGEX" #define APE_TAG_VERSION 2000 #define APE_TAG_FOOTER_BYTES 32 +#define APE_TAG_HEADER_BYTES 32 /** * Read and parse an APE tag |