diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2006-01-08 17:09:05 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2006-01-08 17:09:05 +0000 |
| commit | 52fa37f17c45010fe303607156070d5bb2f44082 (patch) | |
| tree | e77dec040d9890eb758e9cb4fd68c777e1c94f74 | |
| parent | 47ad9abaa51f9ac74218212e1aec76c750e41883 (diff) | |
get_vlc -> get_vlc2 transition.
Originally committed as revision 4827 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/wmadec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index c6aeab59d3..c0ed543d07 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -56,6 +56,8 @@ #define LSP_POW_BITS 7 +#define VLCBITS 9 + typedef struct WMADecodeContext { GetBitContext gb; int sample_rate; @@ -679,7 +681,7 @@ static int decode_exp_vlc(WMADecodeContext *s, int ch) } last_exp = 36; while (q < q_end) { - code = get_vlc(&s->gb, &s->exp_vlc); + code = get_vlc2(&s->gb, s->exp_vlc.table, VLCBITS, 2); if (code < 0) return -1; /* NOTE: this offset is the same as MPEG4 AAC ! */ @@ -820,7 +822,7 @@ static int wma_decode_block(WMADecodeContext *s) if (val == (int)0x80000000) { val = get_bits(&s->gb, 7) - 19; } else { - code = get_vlc(&s->gb, &s->hgain_vlc); + code = get_vlc2(&s->gb, s->hgain_vlc.table, VLCBITS, 2); if (code < 0) return -1; val += code - 18; @@ -877,7 +879,7 @@ static int wma_decode_block(WMADecodeContext *s) eptr = ptr + nb_coefs[ch]; memset(ptr, 0, s->block_len * sizeof(int16_t)); for(;;) { - code = get_vlc(&s->gb, coef_vlc); + code = get_vlc2(&s->gb, coef_vlc->table, VLCBITS, 3); if (code < 0) return -1; if (code == 1) { |