Mercurial > libavcodec.hg
changeset 8894:82545932a261 libavcodec
Merge preprocessor if CONFIG_MPEG_XVMC_DECODER and code if( &&)
where possible
author | iive |
---|---|
date | Sat, 14 Feb 2009 22:59:19 +0000 |
parents | 1f3e03da966a |
children | 0a898394092a |
files | mpeg12.c |
diffstat | 1 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mpeg12.c Sat Feb 14 22:48:59 2009 +0000 +++ b/mpeg12.c Sat Feb 14 22:59:19 2009 +0000 @@ -297,15 +297,13 @@ }else memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ s->mb_intra = 1; -#if CONFIG_MPEG_XVMC_DECODER //if 1, we memcpy blocks in xvmcvideo - if(s->avctx->xvmc_acceleration > 1){ + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1){ ff_xvmc_pack_pblocks(s,-1);//inter are always full blocks if(s->swap_uv){ exchange_uv(s); } } -#endif if (s->codec_id == CODEC_ID_MPEG2VIDEO) { if(s->flags2 & CODEC_FLAG2_FAST){ @@ -510,15 +508,13 @@ return -1; } -#if CONFIG_MPEG_XVMC_DECODER //if 1, we memcpy blocks in xvmcvideo - if(s->avctx->xvmc_acceleration > 1){ + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1){ ff_xvmc_pack_pblocks(s,cbp); if(s->swap_uv){ exchange_uv(s); } } -#endif if (s->codec_id == CODEC_ID_MPEG2VIDEO) { if(s->flags2 & CODEC_FLAG2_FAST){ @@ -1644,13 +1640,11 @@ } } } -#if CONFIG_MPEG_XVMC_DECODER // MPV_frame_start will call this function too, // but we need to call it on every field - if(s->avctx->xvmc_acceleration) + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) if( ff_xvmc_field_start(s,avctx) < 0) return -1; -#endif return 0; } @@ -1736,11 +1730,9 @@ } for(;;) { -#if CONFIG_MPEG_XVMC_DECODER //If 1, we memcpy blocks in xvmcvideo. - if(s->avctx->xvmc_acceleration > 1) + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) ff_xvmc_init_block(s);//set s->block -#endif if(mpeg_decode_mb(s, s->block) < 0) return -1; @@ -1918,10 +1910,9 @@ if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) return 0; -#if CONFIG_MPEG_XVMC_DECODER - if(s->avctx->xvmc_acceleration) + if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) ff_xvmc_field_end(s); -#endif + /* end of slice reached */ if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) { /* end of image */