Mercurial > libavcodec.hg
diff mpegvideo_common.h @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
author | aurel |
---|---|
date | Sun, 09 Mar 2008 23:31:02 +0000 |
parents | 1d83e9c34641 |
children | dfa423a2fc78 |
line wrap: on
line diff
--- a/mpegvideo_common.h Sun Mar 09 17:05:19 2008 +0000 +++ b/mpegvideo_common.h Sun Mar 09 23:31:02 2008 +0000 @@ -608,7 +608,7 @@ prefetch_motion(s, ref_picture, dir); - if(s->obmc && s->pict_type != B_TYPE){ + if(s->obmc && s->pict_type != FF_B_TYPE){ int16_t mv_cache[4][4][2]; const int xy= s->mb_x + s->mb_y*s->mb_stride; const int mot_stride= s->b8_stride; @@ -770,7 +770,7 @@ s->mv[dir][1][0], s->mv[dir][1][1], 8); } } else { - if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ + if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != FF_B_TYPE && !s->first_field){ ref_picture= s->current_picture_ptr->data; } @@ -784,7 +784,7 @@ for(i=0; i<2; i++){ uint8_t ** ref2picture; - if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ + if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == FF_B_TYPE || s->first_field){ ref2picture= ref_picture; }else{ ref2picture= s->current_picture_ptr->data;