diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-03-21 12:04:10 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-05-24 19:07:33 +0200 |
| commit | ab088f7d2842b9c658a8906062a96be37fbc9981 (patch) | |
| tree | bc8efb579d12619a9da9f32dc6d20411ba26eb58 /libavformat/ape.c | |
| parent | b9eb2136af4e9b6700437d996eae731ffca07702 (diff) | |
| download | ffmpeg-ab088f7d2842b9c658a8906062a96be37fbc9981.tar.gz | |
ape: Allow demuxing of files with metadata tags.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/ape.c')
| -rw-r--r-- | libavformat/ape.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c index 956036d5a8..0bc7737fde 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -159,8 +159,8 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap) int total_blocks; int64_t pts; - /* TODO: Skip any leading junk such as id3v2 tags */ - ape->junklength = 0; + /* Skip any leading junk such as id3v2 tags */ + ape->junklength = avio_tell(pb); tag = avio_rl32(pb); if (tag != MKTAG('M', 'A', 'C', ' ')) @@ -276,7 +276,7 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap) ape->frames[0].nblocks = ape->blocksperframe; ape->frames[0].skip = 0; for (i = 1; i < ape->totalframes; i++) { - ape->frames[i].pos = ape->seektable[i]; //ape->frames[i-1].pos + ape->blocksperframe; + ape->frames[i].pos = ape->seektable[i] + ape->junklength; ape->frames[i].nblocks = ape->blocksperframe; ape->frames[i - 1].size = ape->frames[i].pos - ape->frames[i - 1].pos; ape->frames[i].skip = (ape->frames[i].pos - ape->frames[0].pos) & 3; |