diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-09 21:00:43 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-09-30 19:14:33 +0200 |
| commit | 15f740962080ea38244d151d2b33e3034e1bddcd (patch) | |
| tree | bba44a8472eef096f7c8760bd5e5f8ef0f44236d | |
| parent | 319bb8bf451a057ed47fa7817d72678436266128 (diff) | |
exr: Convert to the new bitstream reader
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/exr.c | 12 |
1 files 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; |