diff options
| author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-10 20:04:34 +0200 |
|---|---|---|
| committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:58 +0200 |
| commit | 491adf1086b6b90faae7f91ac292264b1ce0d13d (patch) | |
| tree | fd938e693c8e903574ea9bcc45b269e027269378 | |
| parent | 438a983f74361a219ad3aa678483d68d66c7dd1d (diff) | |
jpeglsenc: convert to the new bitstream reader
| -rw-r--r-- | libavcodec/jpeglsenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index cb9b71e4cd..1bdd2c63f9 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -26,7 +26,7 @@ */ #include "avcodec.h" -#include "get_bits.h" +#include "bitstream.h" #include "golomb.h" #include "internal.h" #include "mathops.h" @@ -258,7 +258,7 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt, JPEGLSContext *ctx = avctx->priv_data; const AVFrame *const p = pict; PutBitContext pb, pb2; - GetBitContext gb; + BitstreamContext bc; uint8_t *buf2 = NULL; uint8_t *zero = NULL; uint8_t *cur = NULL; @@ -393,14 +393,14 @@ FF_ENABLE_DEPRECATION_WARNINGS size = put_bits_count(&pb2); flush_put_bits(&pb2); /* do escape coding */ - init_get_bits(&gb, buf2, size); + bitstream_init(&bc, buf2, size); size -= 7; - while (get_bits_count(&gb) < size) { + while (bitstream_tell(&bc) < size) { int v; - v = get_bits(&gb, 8); + v = bitstream_read(&bc, 8); put_bits(&pb, 8, v); if (v == 0xFF) { - v = get_bits(&gb, 7); + v = bitstream_read(&bc, 7); put_bits(&pb, 8, v); } } |