From 8df1ac6b785a1a159cdffed1eec1ab2a8df66460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Date: Sat, 9 Apr 2016 21:00:43 +0200 Subject: [PATCH] exr: Convert to the new bitstream reader Signed-off-by: Anton Khirnov --- libavcodec/exr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index d10841d8d6..28cee84134 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -39,8 +39,8 @@ #include "libavutil/opt.h" #include "avcodec.h" +#include "bitstream.h" #include "bytestream.h" -#include "get_bits.h" #include "internal.h" #include "mathops.h" #include "thread.h" @@ -379,16 +379,16 @@ static void huf_canonical_code_table(uint64_t *hcode) static int huf_unpack_enc_table(GetByteContext *gb, int32_t im, int32_t iM, uint64_t *hcode) { - GetBitContext gbit; - int ret = init_get_bits8(&gbit, gb->buffer, bytestream2_get_bytes_left(gb)); + BitstreamContext bc; + int ret = bitstream_init8(&bc, gb->buffer, bytestream2_get_bytes_left(gb)); if (ret < 0) return ret; for (; im <= iM; im++) { - uint64_t l = hcode[im] = get_bits(&gbit, 6); + uint64_t l = hcode[im] = bitstream_read(&bc, 6); if (l == LONG_ZEROCODE_RUN) { - int zerun = get_bits(&gbit, 8) + SHORTEST_LONG_RUN; + int zerun = bitstream_read(&bc, 8) + SHORTEST_LONG_RUN; if (im + zerun > iM + 1) return AVERROR_INVALIDDATA; @@ -410,7 +410,7 @@ static int huf_unpack_enc_table(GetByteContext *gb, } } - bytestream2_skip(gb, (get_bits_count(&gbit) + 7) / 8); + bytestream2_skip(gb, (bitstream_tell(&bc) + 7) / 8); huf_canonical_code_table(hcode); return 0;