diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
| commit | 9701840bb539546bc0cfb1307b04655140851b04 (patch) | |
| tree | 283d60d225a87c960c78d20975491802b3385797 /libavcodec/error_resilience.c | |
| parent | 88855b51cdba35c2e7daf8351645d91cf85cb8af (diff) | |
add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 17f04d5abb..bbaf2403e4 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -565,7 +565,7 @@ static int is_intra_more_likely(MpegEncContext *s){ #ifdef HAVE_XVMC //prevent dsp.sad() check, that requires access to the image - if(s->avctx->xvmc_acceleration && s->pict_type==I_TYPE) return 1; + if(s->avctx->xvmc_acceleration && s->pict_type==FF_I_TYPE) return 1; #endif skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs @@ -584,7 +584,7 @@ static int is_intra_more_likely(MpegEncContext *s){ j++; if((j%skip_amount) != 0) continue; //skip a few to speed things up - if(s->pict_type==I_TYPE){ + if(s->pict_type==FF_I_TYPE){ uint8_t *mb_ptr = s->current_picture.data[0] + mb_x*16 + mb_y*16*s->linesize; uint8_t *last_mb_ptr= s->last_picture.data [0] + mb_x*16 + mb_y*16*s->linesize; @@ -893,7 +893,7 @@ void ff_er_frame_end(MpegEncContext *s){ } /* guess MVs */ - if(s->pict_type==B_TYPE){ + if(s->pict_type==FF_B_TYPE){ for(mb_y=0; mb_y<s->mb_height; mb_y++){ for(mb_x=0; mb_x<s->mb_width; mb_x++){ int xy= mb_x*2 + mb_y*2*s->b8_stride; @@ -1031,7 +1031,7 @@ ec_clean: const int mb_xy= s->mb_index2xy[i]; int error= s->error_status_table[mb_xy]; - if(s->pict_type!=B_TYPE && (error&(DC_ERROR|MV_ERROR|AC_ERROR))){ + if(s->pict_type!=FF_B_TYPE && (error&(DC_ERROR|MV_ERROR|AC_ERROR))){ s->mbskip_table[mb_xy]=0; } s->mbintra_table[mb_xy]=1; |