diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 18:53:57 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-02 12:18:44 +0200 |
| commit | 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 (patch) | |
| tree | d462ee5cc7a2f59c44f797c97fc237c999c94e55 /libavcodec/error_resilience.c | |
| parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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 e0b64b0336..e7588a9867 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -639,7 +639,7 @@ static int is_intra_more_likely(MpegEncContext *s){ if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction //prevent dsp.sad() check, that requires access to the image - if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration && s->pict_type == FF_I_TYPE) + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration && s->pict_type == AV_PICTURE_TYPE_I) return 1; skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs @@ -658,7 +658,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==FF_I_TYPE){ + if(s->pict_type==AV_PICTURE_TYPE_I){ 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; @@ -972,7 +972,7 @@ void ff_er_frame_end(MpegEncContext *s){ } /* guess MVs */ - if(s->pict_type==FF_B_TYPE){ + if(s->pict_type==AV_PICTURE_TYPE_B){ 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; @@ -1107,7 +1107,7 @@ ec_clean: const int mb_xy= s->mb_index2xy[i]; int error= s->error_status_table[mb_xy]; - if(s->pict_type!=FF_B_TYPE && (error&(DC_ERROR|MV_ERROR|AC_ERROR))){ + if(s->pict_type!=AV_PICTURE_TYPE_B && (error&(DC_ERROR|MV_ERROR|AC_ERROR))){ s->mbskip_table[mb_xy]=0; } s->mbintra_table[mb_xy]=1; |