X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=e41e8c505e88e8cdbd325d1e299ed292c49e488b;hp=c181fdf68e189dcaa9616858083c3c0d7e6f9875;hb=232020d1a15641c8a492c07f79f59df7d4d279ea;hpb=7978ce515fc2c19ffd8fd7d8fe356f5fa628d7ff diff --git a/wmadec_filter.c b/wmadec_filter.c index c181fdf6..e41e8c50 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -731,10 +731,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd) return -E_INCOHERENT_BLOCK_LEN; if (pwd->ahi.channels == 2) - pwd->ms_stereo = get_bits1(&pwd->gb); + pwd->ms_stereo = get_bit(&pwd->gb); v = 0; for (ch = 0; ch < pwd->ahi.channels; ch++) { - int a = get_bits1(&pwd->gb); + int a = get_bit(&pwd->gb); pwd->channel_coded[ch] = a; v |= a; } @@ -770,7 +770,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) int i, m, a; m = pwd->exponent_high_sizes[bsize]; for (i = 0; i < m; i++) { - a = get_bits1(&pwd->gb); + a = get_bit(&pwd->gb); pwd->high_band_coded[ch][i] = a; /* if noise coding, the coefficients are not transmitted */ if (a) @@ -814,7 +814,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) } /* exponents can be reused in short blocks. */ - if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bits1(&pwd->gb)) { + if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bit(&pwd->gb)) { for (ch = 0; ch < pwd->ahi.channels; ch++) { if (pwd->channel_coded[ch]) { if (pwd->use_exp_vlc) { @@ -867,7 +867,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) run = run_table[code]; level = level_table[code]; } - sign = get_bits1(&pwd->gb); + sign = get_bit(&pwd->gb); if (!sign) level = -level; ptr += run;