diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:30:53 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:30:53 +0200 |
| commit | cae02106b706a9ceb33e4cd288cbecc755d8fbe0 (patch) | |
| tree | 26237499845335c52abf3d5485ff73fe42501f79 /libavcodec/rangecoder.c | |
| parent | c9b35246191fdc1dd70b8cb067711c10c4e75173 (diff) | |
| parent | abe9adfb31566c415fd830a8d4977c79512d4385 (diff) | |
| download | ffmpeg-cae02106b706a9ceb33e4cd288cbecc755d8fbe0.tar.gz | |
Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'
* commit 'abe9adfb31566c415fd830a8d4977c79512d4385':
rangecoder: Use AV_RB16 instead of bytestream_get_be16
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/rangecoder.c')
| -rw-r--r-- | libavcodec/rangecoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index e4c5763e4d..200217a715 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -35,9 +35,10 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" +#include "libavutil/intreadwrite.h" + #include "avcodec.h" #include "rangecoder.h" -#include "bytestream.h" av_cold void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size) { @@ -56,7 +57,8 @@ av_cold void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, /* cast to avoid compiler warning */ ff_init_range_encoder(c, (uint8_t *)buf, buf_size); - c->low = bytestream_get_be16((const uint8_t **)&c->bytestream); + c->low = AV_RB16(c->bytestream); + c->bytestream += 2; } void ff_build_rac_states(RangeCoder *c, int factor, int max_p) |