#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
+#include "golomb.h"
#include "rv34.h"
#include "rv40vlc2.h"
int count = 0;
if(!r->s.mb_skip_run)
- r->s.mb_skip_run = ff_rv34_get_gamma(gb);
+ r->s.mb_skip_run = svq3_get_ue_golomb(gb) + 1;
if(--r->s.mb_skip_run)
return RV34_MB_SKIP;
- if(r->avail[0])
+ if(r->avail_cache[5-1])
blocks[r->mb_type[mb_pos - 1]]++;
- if(r->avail[1]){
+ if(r->avail_cache[5-4]){
blocks[r->mb_type[mb_pos - s->mb_stride]]++;
- if(r->avail[2])
+ if(r->avail_cache[5-2])
blocks[r->mb_type[mb_pos - s->mb_stride + 1]]++;
- if(r->avail[3])
+ if(r->avail_cache[5-5])
blocks[r->mb_type[mb_pos - s->mb_stride - 1]]++;
}
prev_type = i;
}
}
- if(s->pict_type == P_TYPE){
+ if(s->pict_type == FF_P_TYPE){
prev_type = block_num_to_ptype_vlc_num[prev_type];
q = get_vlc2(gb, ptype_vlc[prev_type].table, PTYPE_VLC_BITS, 1);
if(q < PBTYPE_ESCAPE)