diff options
| author | Thibaut Mattern <thibaut.mattern@gmail.com> | 2008-02-18 22:26:43 +0100 |
|---|---|---|
| committer | Thibaut Mattern <thibaut.mattern@gmail.com> | 2008-02-18 22:26:43 +0100 |
| commit | 81f97ffcec8753ec559ea7c3659bbf022d6a9b2b (patch) | |
| tree | 7233a87f0eeea13c2d2102cc1476076023536efd | |
| parent | c84a6972f442ba7baa62dd94ea5cc2882cc50ef3 (diff) | |
| parent | b69b862d5d47f3c17cee1dbbbe4743d51bbc9d3c (diff) | |
| download | xine-lib-81f97ffcec8753ec559ea7c3659bbf022d6a9b2b.tar.gz xine-lib-81f97ffcec8753ec559ea7c3659bbf022d6a9b2b.tar.bz2 | |
merge backout
| -rw-r--r-- | src/demuxers/id3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c index cd72646ef..85b42efa8 100644 --- a/src/demuxers/id3.c +++ b/src/demuxers/id3.c @@ -559,6 +559,7 @@ int id3v23_parse_tag(input_plugin_t *input, if (!id3v23_parse_frame_ext_header(input, &tag_frame_ext_header)) { return 0; } + pos += tag_frame_ext_header.size; } /* frame parsing */ while ((pos + ID3V23_FRAME_HEADER_SIZE) <= tag_header.size) { @@ -579,7 +580,8 @@ int id3v23_parse_tag(input_plugin_t *input, pos += tag_frame_header.size; } else { /* end of frames, the rest is padding */ - input->seek (input, tag_header.size - pos, SEEK_CUR); + lprintf("skipping padding %d bytes\n", tag_header.size - pos); + input->seek (input, tag_header.size - pos, SEEK_CUR); return 1; } } else { @@ -809,6 +811,7 @@ int id3v24_parse_tag(input_plugin_t *input, if (!id3v24_parse_ext_header(input, &tag_frame_ext_header)) { return 0; } + pos += tag_frame_ext_header.size; } /* frame parsing */ while ((pos + ID3V24_FRAME_HEADER_SIZE) <= tag_header.size) { |