summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-10-10 12:12:08 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-10-10 12:12:08 +0100
commitb32aaa6a9fd2e871f12d902dd656d15e15dc78b1 (patch)
treea5f4138b3f380ab278c407cbfa7545fc6af74ca9
parentae9b5a75d9560ec5ce88f93e89efccdf64594100 (diff)
downloadxine-lib-b32aaa6a9fd2e871f12d902dd656d15e15dc78b1.tar.gz
xine-lib-b32aaa6a9fd2e871f12d902dd656d15e15dc78b1.tar.bz2
Fix parsing of ID3 tag content lengths.
-rw-r--r--src/demuxers/id3.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 39055a852..070ca2650 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -259,7 +259,7 @@ static int id3v22_parse_frame_header(input_plugin_t *input,
if (len == ID3V22_FRAME_HEADER_SIZE) {
frame_header->id = (buf[0] << 16) + (buf[1] << 8) + buf[2];
- frame_header->size = _X_BE_24_synchsafe(&buf[3]);
+ frame_header->size = _X_BE_24(&buf[3]);
lprintf("frame: %c%c%c: size: %zu\n", buf[0], buf[1], buf[2],
frame_header->size);
@@ -434,7 +434,7 @@ static int id3v23_parse_frame_ext_header(input_plugin_t *input,
if (input->read (input, buf, 4) == 4) {
- frame_ext_header->size = _X_BE_32_synchsafe(&buf[0]);
+ frame_ext_header->size = _X_BE_32(&buf[0]);
if (frame_ext_header->size == 6) {
if (input->read (input, buf + 4, 6) == 6) {
@@ -631,7 +631,7 @@ static int id3v24_parse_frame_header(input_plugin_t *input,
len = input->read (input, buf, ID3V24_FRAME_HEADER_SIZE);
if (len == ID3V24_FRAME_HEADER_SIZE) {
frame_header->id = _X_BE_32(buf);
- frame_header->size = _X_BE_32_synchsafe(&buf[4]);
+ frame_header->size = _X_BE_32(&buf[4]);
frame_header->flags = _X_BE_16(&buf[8]);
lprintf("frame: %c%c%c%c, size: %zu, flags: %X\n", buf[0], buf[1], buf[2], buf[3],
@@ -649,7 +649,7 @@ static int id3v24_parse_ext_header(input_plugin_t *input,
if (input->read (input, buf, 4) == 4) {
- frame_ext_header->size = _X_BE_32_synchsafe(&buf[0]);
+ frame_ext_header->size = _X_BE_32(&buf[0]);
if (input->read (input, buf, 2) == 2) {
uint8_t flags_size = buf[0];