diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-02-16 11:49:08 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-02-16 11:49:08 +0000 |
commit | 83344066d326e6bad20feb66825ace12708eb084 (patch) | |
tree | 381eb5df2e86efed445652d0c6f05389d933e975 /libavcodec/mpegvideo.c | |
parent | 42dfc2bfa90d8496b343a322935bfd843162ffd6 (diff) | |
download | ffmpeg-streaming-83344066d326e6bad20feb66825ace12708eb084.zip ffmpeg-streaming-83344066d326e6bad20feb66825ace12708eb084.tar.gz |
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.
Originally committed as revision 17369 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index da19243..41ad43c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -936,10 +936,9 @@ alloc: 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 @@ void MPV_frame_end(MpegEncContext *s) { 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 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], { 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; |