Mercurial > libavcodec.hg
diff mpegvideo.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 | f8042554d4c8 |
children | c6aff37981b6 |
line wrap: on
line diff
--- a/mpegvideo.c Mon Feb 16 11:35:38 2009 +0000 +++ b/mpegvideo.c Mon Feb 16 11:49:08 2009 +0000 @@ -936,10 +936,9 @@ update_noise_reduction(s); } -#if CONFIG_MPEG_XVMC_DECODER - if(s->avctx->xvmc_acceleration) + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) return ff_xvmc_field_start(s, avctx); -#endif + return 0; } @@ -948,12 +947,10 @@ { int i; /* draw edge for correct motion prediction if outside */ -#if CONFIG_MPEG_XVMC_DECODER //just to make sure that all data is rendered. - if(s->avctx->xvmc_acceleration){ + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ ff_xvmc_field_end(s); }else -#endif if(!(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) && s->unrestricted_mv && s->current_picture.reference @@ -1733,12 +1730,10 @@ { int mb_x, mb_y; const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; -#if CONFIG_MPEG_XVMC_DECODER - if(s->avctx->xvmc_acceleration){ + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){ ff_xvmc_decode_mb(s);//xvmc uses pblocks return; } -#endif mb_x = s->mb_x; mb_y = s->mb_y;