diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-13 05:54:52 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-13 05:54:52 +0000 |
| commit | c351e6262012a8fee256ff2838c3bd6a1036ad1c (patch) | |
| tree | 74d9f8d9a84289c83d4a78df9c8ceb60090aecf1 | |
| parent | 23ec0a537fa0533a56f46f2ebbdbf9831d3e0e69 (diff) | |
| download | rockbox-c351e6262012a8fee256ff2838c3bd6a1036ad1c.tar.gz rockbox-c351e6262012a8fee256ff2838c3bd6a1036ad1c.zip | |
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
| -rw-r--r-- | apps/mp3data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/mp3data.c b/apps/mp3data.c index 44208604bc..54902e92a4 100644 --- a/apps/mp3data.c +++ b/apps/mp3data.c | |||
| @@ -462,7 +462,7 @@ int get_mp3file_info(int fd, struct mp3info *info) | |||
| 462 | #if CONFIG_CODEC==SWCODEC | 462 | #if CONFIG_CODEC==SWCODEC |
| 463 | i += 21; | 463 | i += 21; |
| 464 | info->enc_delay = ((int)vbrheader[i ] << 4) | (vbrheader[i+1] >> 4); | 464 | info->enc_delay = ((int)vbrheader[i ] << 4) | (vbrheader[i+1] >> 4); |
| 465 | info->enc_padding = ((int)vbrheader[i+1] << 8) | vbrheader[i+2]; | 465 | info->enc_padding = ((int)(vbrheader[i+1]&0xF) << 8) | vbrheader[i+2]; |
| 466 | /* TODO: This sanity checking is rather silly, seeing as how the LAME | 466 | /* TODO: This sanity checking is rather silly, seeing as how the LAME |
| 467 | header contains a CRC field that can be used to verify integrity. */ | 467 | header contains a CRC field that can be used to verify integrity. */ |
| 468 | if (!(info->enc_delay >= 0 && info->enc_delay <= 2880 && | 468 | if (!(info->enc_delay >= 0 && info->enc_delay <= 2880 && |