diff options
Diffstat (limited to 'apps/codecs/libmusepack/mpc_decoder.c')
-rw-r--r-- | apps/codecs/libmusepack/mpc_decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c index 7bf7935d39..eb8916f343 100644 --- a/apps/codecs/libmusepack/mpc_decoder.c +++ b/apps/codecs/libmusepack/mpc_decoder.c | |||
@@ -610,7 +610,7 @@ static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, | |||
610 | } | 610 | } |
611 | 611 | ||
612 | if (d->ms) { | 612 | if (d->ms) { |
613 | int cnt = 0, tot = 0; | 613 | mpc_uint_t cnt = 0, tot = 0; |
614 | mpc_uint32_t tmp = 0; | 614 | mpc_uint32_t tmp = 0; |
615 | for( n = 0; n < Max_used_Band; n++) | 615 | for( n = 0; n < Max_used_Band; n++) |
616 | if ( d->Res_L[n] != 0 || d->Res_R[n] != 0 ) | 616 | if ( d->Res_L[n] != 0 || d->Res_R[n] != 0 ) |
@@ -687,10 +687,10 @@ static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, | |||
687 | /***************************** Samples ****************************/ | 687 | /***************************** Samples ****************************/ |
688 | for ( n = 0; n < Max_used_Band; n++ ) { | 688 | for ( n = 0; n < Max_used_Band; n++ ) { |
689 | mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n]; | 689 | mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n]; |
690 | static const int thres[] = {0, 0, 3, 0, 0, 1, 3, 4, 8}; | 690 | static const mpc_uint32_t thres[] = {0, 0, 3, 0, 0, 1, 3, 4, 8}; |
691 | do { | 691 | do { |
692 | mpc_uint32_t nbit; | 692 | mpc_uint32_t nbit; |
693 | mpc_int32_t k = 0, idx = 1, dc; | 693 | mpc_uint32_t k = 0, idx = 1, dc; |
694 | if (Res != 0) { | 694 | if (Res != 0) { |
695 | if (Res == 2) { | 695 | if (Res == 2) { |
696 | Tables[0] = & mpc_can_Q [0][0]; | 696 | Tables[0] = & mpc_can_Q [0][0]; |
@@ -706,7 +706,7 @@ static void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, | |||
706 | } else if (Res == 1) { | 706 | } else if (Res == 1) { |
707 | Table = & mpc_can_Q1; | 707 | Table = & mpc_can_Q1; |
708 | for( ; k < 36; ){ | 708 | for( ; k < 36; ){ |
709 | int kmax = k + 18; | 709 | mpc_uint32_t kmax = k + 18; |
710 | mpc_uint_t cnt = mpc_bits_can_dec(r, Table); | 710 | mpc_uint_t cnt = mpc_bits_can_dec(r, Table); |
711 | idx = 0; | 711 | idx = 0; |
712 | if (cnt > 0 && cnt < 18) | 712 | if (cnt > 0 && cnt < 18) |