har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'

Browse Source 
* commit 'abe9adfb31566c415fd830a8d4977c79512d4385':
  rangecoder: Use AV_RB16 instead of bytestream_get_be16

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-05 11:30:53 +02:00
commit cae02106b7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/rangecoder.c
View File

@ -35,9 +35,10 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "rangecoder.h" #include "rangecoder.h"
#include "bytestream.h"
av_cold void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size) 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 */ /* cast to avoid compiler warning */
ff_init_range_encoder(c, (uint8_t *)buf, buf_size); 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) void ff_build_rac_states(RangeCoder *c, int factor, int max_p)