*/
#include "libavutil/imgutils.h"
+
#include "avcodec.h"
+#include "bitstream.h"
#include "bytestream.h"
-#include "get_bits.h"
#include "internal.h"
#define PCX_HEADER_SIZE 128
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);
pcx_rle_decode(&gb, 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 */