From e561146611f5cf410df78b53a4ca5cded2272fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Date: Sat, 9 Apr 2016 17:34:03 +0200 Subject: [PATCH] cljrdec: Convert to the new bitstream reader Signed-off-by: Anton Khirnov --- libavcodec/cljrdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c index 33d8023429..833707b099 100644 --- a/libavcodec/cljrdec.c +++ b/libavcodec/cljrdec.c @@ -25,7 +25,7 @@ */ #include "avcodec.h" -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" static int decode_frame(AVCodecContext *avctx, @@ -34,7 +34,7 @@ static int decode_frame(AVCodecContext *avctx, { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - GetBitContext gb; + BitstreamContext bc; AVFrame * const p = data; int x, y, ret; @@ -56,20 +56,20 @@ static int decode_frame(AVCodecContext *avctx, p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; - init_get_bits(&gb, buf, buf_size * 8); + bitstream_init(&bc, buf, buf_size * 8); for (y = 0; y < avctx->height; y++) { uint8_t *luma = &p->data[0][y * p->linesize[0]]; uint8_t *cb = &p->data[1][y * p->linesize[1]]; uint8_t *cr = &p->data[2][y * p->linesize[2]]; for (x = 0; x < avctx->width; x += 4) { - luma[3] = get_bits(&gb, 5) << 3; - luma[2] = get_bits(&gb, 5) << 3; - luma[1] = get_bits(&gb, 5) << 3; - luma[0] = get_bits(&gb, 5) << 3; + luma[3] = bitstream_read(&bc, 5) << 3; + luma[2] = bitstream_read(&bc, 5) << 3; + luma[1] = bitstream_read(&bc, 5) << 3; + luma[0] = bitstream_read(&bc, 5) << 3; luma += 4; - *(cb++) = get_bits(&gb, 6) << 2; - *(cr++) = get_bits(&gb, 6) << 2; + *(cb++) = bitstream_read(&bc, 6) << 2; + *(cr++) = bitstream_read(&bc, 6) << 2; } }