From abe9adfb31566c415fd830a8d4977c79512d4385 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 2 Oct 2015 12:43:42 +0200 Subject: [PATCH] rangecoder: Use AV_RB16 instead of bytestream_get_be16 Silence an incompatible-pointer-types-discards-qualifiers warning from clang. rangecoder.c:58:34: warning: passing 'uint8_t **' (aka 'unsigned char **') to parameter of type 'const uint8_t **' (aka 'const unsigned char **') discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers] --- libavcodec/rangecoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index af0a8c009e..9897f586df 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -34,9 +34,10 @@ #include #include "libavutil/attributes.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) { @@ -55,7 +56,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(&c->bytestream); + c->low = AV_RB16(c->bytestream); + c->bytestream += 2; } void ff_build_rac_states(RangeCoder *c, int factor, int max_p)