Mercurial > libavcodec.hg
changeset 8832:3eaabd9c4371 libavcodec
Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
| author | diego |
|---|---|
| date | Sat, 14 Feb 2009 15:37:40 +0000 |
| parents | 27616b326d57 |
| children | 48b15a3f86f3 |
| files | Makefile error_resilience.c mpeg12.c mpegvideo.c |
| diffstat | 4 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Feb 14 15:30:40 2009 +0000 +++ b/Makefile Sat Feb 14 15:37:40 2009 +0000 @@ -137,6 +137,7 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPEG_VDPAU_DECODER) += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1_VDPAU_DECODER) += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o @@ -252,7 +253,6 @@ OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.o OBJS-$(CONFIG_XL_DECODER) += xl.o OBJS-$(CONFIG_XSUB_DECODER) += xsubdec.o -OBJS-$(CONFIG_XVMC) += mpegvideo_xvmc.o OBJS-$(CONFIG_ZLIB_DECODER) += lcldec.o OBJS-$(CONFIG_ZLIB_ENCODER) += lclenc.o OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
--- a/error_resilience.c Sat Feb 14 15:30:40 2009 +0000 +++ b/error_resilience.c Sat Feb 14 15:37:40 2009 +0000 @@ -563,7 +563,7 @@ if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction -#if CONFIG_XVMC +#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 @@ -935,7 +935,7 @@ }else guess_mv(s); -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER /* the filters below are not XvMC compatible, skip them */ if(s->avctx->xvmc_acceleration) goto ec_clean; #endif @@ -1024,7 +1024,7 @@ v_block_filter(s, s->current_picture.data[2], s->mb_width , s->mb_height , s->uvlinesize, 0); } -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER ec_clean: #endif /* clean a few tables */
--- a/mpeg12.c Sat Feb 14 15:30:40 2009 +0000 +++ b/mpeg12.c Sat Feb 14 15:37:40 2009 +0000 @@ -301,7 +301,7 @@ }else memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ s->mb_intra = 1; -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,-1);//inter are always full blocks @@ -514,7 +514,7 @@ return -1; } -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,cbp); @@ -1648,7 +1648,7 @@ } } } -#if CONFIG_XVMC +#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) @@ -1739,7 +1739,7 @@ } for(;;) { -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER //If 1, we memcpy blocks in xvmcvideo. if(s->avctx->xvmc_acceleration > 1) XVMC_init_block(s);//set s->block @@ -1921,7 +1921,7 @@ if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) return 0; -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER if(s->avctx->xvmc_acceleration) XVMC_field_end(s); #endif @@ -2487,7 +2487,7 @@ .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){ Mpeg1Context *s;
--- a/mpegvideo.c Sat Feb 14 15:30:40 2009 +0000 +++ b/mpegvideo.c Sat Feb 14 15:37:40 2009 +0000 @@ -939,7 +939,7 @@ update_noise_reduction(s); } -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER if(s->avctx->xvmc_acceleration) return XVMC_field_start(s, avctx); #endif @@ -951,7 +951,7 @@ { int i; /* draw edge for correct motion prediction if outside */ -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER //just to make sure that all data is rendered. if(s->avctx->xvmc_acceleration){ XVMC_field_end(s); @@ -1736,7 +1736,7 @@ { int mb_x, mb_y; const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER if(s->avctx->xvmc_acceleration){ XVMC_decode_mb(s);//xvmc uses pblocks return;