diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
| commit | b20fe650ef856006b50bbd767a39e19a8a6319f8 (patch) | |
| tree | 12b60fd9a8960a113e30a566b54c2b3f9e43738c /libavcodec/rv30.c | |
| parent | 324f0fbff1245f9e9e1dda29ecb03138a2de287d (diff) | |
| parent | 4024b566d664a4b161d677554be52f32e7ad4236 (diff) | |
| download | ffmpeg-b20fe650ef856006b50bbd767a39e19a8a6319f8.tar.gz | |
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/rv30.c')
| -rw-r--r-- | libavcodec/rv30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 3b9868cd5e..ddaaac651c 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -89,7 +89,7 @@ static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t for(i = 0; i < 4; i++, dst += r->intra_types_stride - 4){ for(j = 0; j < 4; j+= 2){ - unsigned code = svq3_get_ue_golomb(gb) << 1; + unsigned code = get_interleaved_ue_golomb(gb) << 1; if (code > 80U*2U) { av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n"); return -1; @@ -117,7 +117,7 @@ static int rv30_decode_mb_info(RV34DecContext *r) static const int rv30_b_types[6] = { RV34_MB_SKIP, RV34_MB_B_DIRECT, RV34_MB_B_FORWARD, RV34_MB_B_BACKWARD, RV34_MB_TYPE_INTRA, RV34_MB_TYPE_INTRA16x16 }; MpegEncContext *s = &r->s; GetBitContext *gb = &s->gb; - unsigned code = svq3_get_ue_golomb(gb); + unsigned code = get_interleaved_ue_golomb(gb); if (code > 11) { av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n"); |