aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv30.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-05-24 01:20:34 +0200
committerDiego Biurrun <diego@biurrun.de>2016-05-25 16:37:43 +0200
commit4024b566d664a4b161d677554be52f32e7ad4236 (patch)
tree6c6d4d8f49be52db176c89809d3b6029f0d4e472 /libavcodec/rv30.c
parent7ca4fdc046a945949866bb6fc550e3cab1fc8c00 (diff)
downloadffmpeg-4024b566d664a4b161d677554be52f32e7ad4236.tar.gz
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Diffstat (limited to 'libavcodec/rv30.c')
-rw-r--r--libavcodec/rv30.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index bf22df5f10..7218fa36dc 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -81,7 +81,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 >= 81*2){
av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n");
return -1;
@@ -109,7 +109,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");