X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frv30.c;h=ddaaac651c7c259c6cdc979b6b133c9a398efb10;hb=230178dfe25ebe27934062c9fa8e2a40e6ad2b0b;hp=3b9868cd5ec62f59e93f6973f37567b086aab600;hpb=3689efea3d59579291ecafccc3d9cbe720e7bea3;p=ffmpeg diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 3b9868cd5ec..ddaaac651c7 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");