Merge branch 'v0.19.x'

This commit is contained in:
Max Kellermann
2016-02-19 18:16:04 +01:00
3 changed files with 14 additions and 8 deletions

View File

@@ -84,14 +84,14 @@ aiff_seek_id3(FILE *file)
underflow when casting to off_t */
return 0;
if (size % 2 != 0)
/* pad byte */
++size;
if (memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */
return size;
if (size % 2 != 0)
/* pad byte */
++size;
if (fseek(file, size, SEEK_CUR) != 0)
return 0;
}

View File

@@ -82,15 +82,15 @@ riff_seek_id3(FILE *file)
underflow when casting to off_t */
return 0;
if (size % 2 != 0)
/* pad byte */
++size;
if (memcmp(chunk.id, "id3 ", 4) == 0 ||
memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */
return size;
if (size % 2 != 0)
/* pad byte */
++size;
if (fseek(file, size, SEEK_CUR) != 0)
return 0;
}