Author: titmuss
Date: Tue Jan 6 03:00:22 2009
New Revision: 3684
URL: http://svn.slimdevices.com?rev=3684&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3680): titmuss | 2009-01-05 22:36:43 +0000
r3...@harrypotter (orig r3679): bklaas | 2009-01-05 22:34:57 +0000
Bug: 7186
Description: push back changes for this fix from 7.4 trunk back to 7.3 trunk
so this fix makes it into 7.3.2
r3...@harrypotter (orig r3683): titmuss | 2009-01-06 10:59:42 +0000
r3...@harrypotter (orig r3682): titmuss | 2009-01-06 10:58:38 +0000
Bug: 10542
Description:
Fix from Josh Coalson for libFLAC to solve audio playback problems.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/bitreader.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 6 03:00:22 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3666
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3673
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3682
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3683
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/bitreader.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/bitreader.c?rev=3684&root=Jive&r1=3683&r2=3684&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/bitreader.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/bitreader.c Tue
Jan 6 03:00:22 2009
@@ -751,7 +751,7 @@
* us data a byte at a time (unlikely), br->consumed_bits may
not
* be zero.
*/
- if(br->bytes) {
+ if(br->bytes*8 > br->consumed_bits) {
const unsigned end = br->bytes * 8;
brword b = (br->buffer[br->consumed_words] &
(FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << br->consumed_bits;
if(b) {
@@ -764,7 +764,7 @@
}
else {
*val += end - br->consumed_bits;
- br->consumed_bits += end;
+ br->consumed_bits = end;
FLAC__ASSERT(br->consumed_bits <
FLAC__BITS_PER_WORD);
/* didn't find stop bit yet, have to keep
going... */
}
@@ -874,7 +874,7 @@
* us data a byte at a time (unlikely),
br->consumed_bits may not
* be zero.
*/
- if(br->bytes) {
+ if(br->bytes*8 > cbits) {
const unsigned end = br->bytes * 8;
brword b = (br->buffer[cwords] &
(FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << cbits;
if(b) {
@@ -888,7 +888,7 @@
}
else {
uval += end - cbits;
- cbits += end;
+ cbits = end;
FLAC__ASSERT(cbits <
FLAC__BITS_PER_WORD);
/* didn't find stop bit yet, have to
keep going... */
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
