diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 17:18:09 +0200 |
|---|---|---|
| committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:58 +0200 |
| commit | 83330be47d2fdaa0a2780f3c5b104f646819d175 (patch) | |
| tree | 5c4306ba240861f0d5fb982b90d0c9371e2a7c67 | |
| parent | 489c6845789e986542a02b3d3348cc0bf7bab2b8 (diff) | |
interplayvideo: convert to the new bitstream reader
| -rw-r--r-- | libavcodec/interplayvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index e41fc34579..c8a704d39d 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -42,7 +42,7 @@ #include "bytestream.h" #include "hpeldsp.h" #define BITSTREAM_READER_LE -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" #define PALETTE_COUNT 256 @@ -881,7 +881,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame) int x, y; unsigned char opcode; int ret; - GetBitContext gb; + BitstreamContext bc; bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */ if (!s->is_16bpp) { @@ -898,10 +898,10 @@ static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame) s->upper_motion_limit_offset = (s->avctx->height - 8) * frame->linesize[0] + (s->avctx->width - 8) * (1 + s->is_16bpp); - init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8); + bitstream_init(&bc, s->decoding_map, s->decoding_map_size * 8); for (y = 0; y < s->avctx->height; y += 8) { for (x = 0; x < s->avctx->width; x += 8) { - opcode = get_bits(&gb, 4); + opcode = bitstream_read(&bc, 4); ff_dlog(s->avctx, " block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n", |