diff options
Diffstat (limited to 'libavcodec/wma.h')
| -rw-r--r-- | libavcodec/wma.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index c954d71e28..6d14fc66c6 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -25,8 +25,8 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" +#include "bitstream.h" #include "fft.h" -#include "get_bits.h" #include "put_bits.h" /* size of blocks */ @@ -66,7 +66,7 @@ typedef struct CoefVLCTable { typedef struct WMACodecContext { AVCodecContext *avctx; - GetBitContext gb; + BitstreamContext bc; PutBitContext pb; int version; ///< 1 = 0x160 (WMAV1), 2 = 0x161 (WMAV2) int use_bit_reservoir; @@ -147,8 +147,8 @@ extern const uint8_t ff_aac_scalefactor_bits[121]; int ff_wma_init(AVCodecContext *avctx, int flags2); int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); -unsigned int ff_wma_get_large_val(GetBitContext *gb); -int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, +unsigned int ff_wma_get_large_val(BitstreamContext *bc); +int ff_wma_run_level_decode(AVCodecContext *avctx, BitstreamContext *bc, VLC *vlc, const float *level_table, const uint16_t *run_table, int version, WMACoef *ptr, int offset, int num_coefs, |