ffmpeg | branch: master | Alexandra Hájková <alexan...@khirnov.net> | Tue Apr 12 18:32:50 2016 +0200| [770406d1e8291dbfd846210d08c1b322d30c8142] | committer: Anton Khirnov
pcx: Convert to the new bitstream reader Signed-off-by: Anton Khirnov <an...@khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=770406d1e8291dbfd846210d08c1b322d30c8142 --- libavcodec/pcx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index a2d49b4..ece885e 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -23,9 +23,10 @@ */ #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 @@ -179,15 +180,15 @@ 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); 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 */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
