diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-15 10:57:22 +0200 |
|---|---|---|
| committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:48:00 +0200 |
| commit | 894fb356578cbb64ba9387fdd16bffcf8b8d8496 (patch) | |
| tree | f12192427729ca5916407563c8e8d71e76e268b6 | |
| parent | 25c64b3c3de738e311c40e46871c02ed853a0ba2 (diff) | |
xan: convert to the new bitstream reader
| -rw-r--r-- | libavcodec/xan.c | 8 | ||||
| -rw-r--r-- | libavcodec/xxan.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c index a46b58c7f1..35f586072b 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -37,7 +37,7 @@ #include "avcodec.h" #include "bytestream.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" #define RUNTIME_GAMMA 0 @@ -123,15 +123,15 @@ static int xan_huffman_decode(unsigned char *dest, int dest_len, unsigned char val = ival; unsigned char *dest_end = dest + dest_len; unsigned char *dest_start = dest; - GetBitContext gb; + BitstreamContext bc; if (ptr_len < 0) return AVERROR_INVALIDDATA; - init_get_bits(&gb, ptr, ptr_len * 8); + bitstream_init(&bc, ptr, ptr_len * 8); while (val != 0x16) { - unsigned idx = val - 0x17 + get_bits1(&gb) * byte; + unsigned idx = val - 0x17 + bitstream_read_bit(&bc) * byte; if (idx >= 2 * byte) return AVERROR_INVALIDDATA; val = src[idx]; diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 6369b7de8a..c36b0bd053 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -25,7 +25,6 @@ #include "libavutil/mem.h" #include "bytestream.h" #define BITSTREAM_READER_LE -#include "get_bits.h" #include "internal.h" typedef struct XanContext { |