diff options
author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-13 19:34:49 +0200 |
---|---|---|
committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:59 +0200 |
commit | 0cbf20a0374415fb06729c2fdfcc1df4b658d1bb (patch) | |
tree | 1f63b6d42db62479dffab2e07bbc527a1706ee77 | |
parent | 2e2036d4bbc59853dc5ef55a3a29c1d54ae9450c (diff) |
ra288: convert to the new bitstream reader
-rw-r--r-- | libavcodec/ra288.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index a9f1045301..f9398e17f6 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "internal.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "bitstream.h" #include "ra288.h" #include "lpc.h" #include "celp_filters.h" @@ -180,7 +180,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data, float *out; int i, ret; RA288Context *ractx = avctx->priv_data; - GetBitContext gb; + BitstreamContext bc; if (buf_size < avctx->block_align) { av_log(avctx, AV_LOG_ERROR, @@ -197,11 +197,11 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data, } out = (float *)frame->data[0]; - init_get_bits(&gb, buf, avctx->block_align * 8); + bitstream_init(&bc, buf, avctx->block_align * 8); for (i=0; i < RA288_BLOCKS_PER_FRAME; i++) { - float gain = amptable[get_bits(&gb, 3)]; - int cb_coef = get_bits(&gb, 6 + (i&1)); + float gain = amptable[bitstream_read(&bc, 3)]; + int cb_coef = bitstream_read(&bc, 6 + (i & 1)); decode(ractx, gain, cb_coef); |