Merge r29708 to v3.8 branch. Fixes gapless playback (FS#12062).

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_8@29709 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-04-13 05:54:52 +00:00
parent 23ec0a537f
commit c351e62620

View file

@ -462,7 +462,7 @@ int get_mp3file_info(int fd, struct mp3info *info)
#if CONFIG_CODEC==SWCODEC
i += 21;
info->enc_delay = ((int)vbrheader[i ] << 4) | (vbrheader[i+1] >> 4);
info->enc_padding = ((int)vbrheader[i+1] << 8) | vbrheader[i+2];
info->enc_padding = ((int)(vbrheader[i+1]&0xF) << 8) | vbrheader[i+2];
/* TODO: This sanity checking is rather silly, seeing as how the LAME
header contains a CRC field that can be used to verify integrity. */
if (!(info->enc_delay >= 0 && info->enc_delay <= 2880 &&