diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 18:32:50 +0200 |
|---|---|---|
| committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:59 +0200 |
| commit | be31a1b5244b4db91f1b747a64f18b1e2cba7fae (patch) | |
| tree | 216d15531f6ec7bcbc14c58f23dd93edb0e9cde0 | |
| parent | 16709052859fdcfde13e571fe267d70558ebe345 (diff) | |
pcx: convert to the new bitstream reader
| -rw-r--r-- | libavcodec/pcx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index aa69d510ea..cf45434aa1 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -25,7 +25,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" /** @@ -192,16 +192,16 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, goto end; } } else if (nplanes == 1) { /* all packed formats, max. 16 colors */ - GetBitContext s; + BitstreamContext s; for (y = 0; y < h; y++) { - init_get_bits(&s, scanline, bytes_per_scanline << 3); + bitstream_init(&s, scanline, bytes_per_scanline << 3); buf = pcx_rle_decode(buf, buf_end, scanline, bytes_per_scanline, compressed); for (x = 0; x < w; x++) - ptr[x] = get_bits(&s, bits_per_pixel); + ptr[x] = bitstream_read(&s, bits_per_pixel); ptr += stride; } } else { /* planar, 4, 8 or 16 colors */ |