Mercurial > audlegacy
changeset 1367:d872c88f8c6f trunk
[svn] - fix a regression involving large ID3 tags being bolted right in the middle of a fraunhofer VBRX TOC (iTunes fucking fails)
| author | nenolod |
|---|---|
| date | Tue, 04 Jul 2006 00:25:25 -0700 |
| parents | f66048e606f0 |
| children | 9dc0ce1fd3cd |
| files | ChangeLog Plugins/Input/mpg123/common.c |
| diffstat | 2 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jul 01 16:19:46 2006 -0700 +++ b/ChangeLog Tue Jul 04 00:25:25 2006 -0700 @@ -1,3 +1,11 @@ +2006-07-01 23:19:46 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [1644] + Show whether modplug will actually be built (wrong var was being displayed). + + Changes: Modified: + +1 -1 trunk/configure.ac + + 2006-07-01 11:24:23 +0000 George Averill <nhjm449@gmail.com> revision [1642] - Added playlist-delete command.
--- a/Plugins/Input/mpg123/common.c Sat Jul 01 16:19:46 2006 -0700 +++ b/Plugins/Input/mpg123/common.c Tue Jul 04 00:25:25 2006 -0700 @@ -251,19 +251,15 @@ do { try++; - if ((newhead & 0xffffff00) == - ('I' << 24) + ('D' << 16) + ('3' << 8)) { - if (!stream_head_read(&newhead)) - return FALSE; - } - else if (!stream_head_shift(&newhead)) + if (!stream_head_shift(&newhead)) return 0; - } while ((!mpgdec_head_check(newhead) || - !mpgdec_decode_header(fr, newhead)) && try < (256 * 1024)); - if (try >= (256 * 1024)) + !mpgdec_decode_header(fr, newhead)) && try < (1024 * 1024)); + if (try >= (1024 * 1024)) return FALSE; + if (try >= 0) + g_print("mpgdec: illegal bitstream in the middle of the MPEG stream, skipped %d bytes\n", try); mpgdec_info->filesize -= try; }