Mercurial > libavcodec.hg
diff error_resilience.c @ 8948:886ef38c7b36 libavcodec
Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if
statements by merging the CONFIG_MPEG_XVMC_DECODER check into the if condition.
author | diego |
---|---|
date | Mon, 16 Feb 2009 11:49:08 +0000 |
parents | 3eaabd9c4371 |
children | 15a3df8c01fd |
line wrap: on
line diff
--- a/error_resilience.c Mon Feb 16 11:35:38 2009 +0000 +++ b/error_resilience.c Mon Feb 16 11:49:08 2009 +0000 @@ -563,10 +563,9 @@ if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction -#if CONFIG_MPEG_XVMC_DECODER //prevent dsp.sad() check, that requires access to the image - if(s->avctx->xvmc_acceleration && s->pict_type==FF_I_TYPE) return 1; -#endif + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration && s->pict_type == FF_I_TYPE) + return 1; skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs is_intra_likely=0; @@ -935,10 +934,9 @@ }else guess_mv(s); -#if CONFIG_MPEG_XVMC_DECODER /* the filters below are not XvMC compatible, skip them */ - if(s->avctx->xvmc_acceleration) goto ec_clean; -#endif + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) + goto ec_clean; /* fill DC for inter blocks */ for(mb_y=0; mb_y<s->mb_height; mb_y++){ for(mb_x=0; mb_x<s->mb_width; mb_x++){ @@ -1024,9 +1022,7 @@ v_block_filter(s, s->current_picture.data[2], s->mb_width , s->mb_height , s->uvlinesize, 0); } -#if CONFIG_MPEG_XVMC_DECODER ec_clean: -#endif /* clean a few tables */ for(i=0; i<s->mb_num; i++){ const int mb_xy= s->mb_index2xy[i];