Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 5 Oct 2015 09:30:53 +0000 (11:30 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 5 Oct 2015 09:30:53 +0000 (11:30 +0200)
* commit 'abe9adfb31566c415fd830a8d4977c79512d4385':
  rangecoder: Use AV_RB16 instead of bytestream_get_be16

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/rangecoder.c

  #include <string.h>
  
  #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)
  {