rangecoder: Use AV_RB16 instead of bytestream_get_be16
authorVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 2 Oct 2015 10:43:42 +0000 (12:43 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Sun, 4 Oct 2015 11:09:08 +0000 (13:09 +0200)
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

index af0a8c0..9897f58 100644 (file)
 #include <string.h>
 
 #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)