diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/error_resilience.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 12 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
5 files changed, 14 insertions, 16 deletions
@@ -91,7 +91,6 @@ show_help(){ echo " --enable-w32threads use Win32 threads [no]" echo " --enable-x11grab enable X11 grabbing [no]" echo " --enable-vdpau enable VDPAU support [no]" - echo " --enable-xvmc enable XvMC support [no]" echo " --disable-network disable network support [no]" echo " --disable-ipv6 disable IPv6 support [no]" echo " --disable-mpegaudio-hp faster (but less accurate) MPEG audio decoding [no]" @@ -793,7 +792,6 @@ CONFIG_LIST=" vdpau vhook x11grab - xvmc zlib " @@ -1015,7 +1013,7 @@ mpeg2video_encoder_select="aandct" mpeg4_encoder_select="aandct" mpeg_vdpau_decoder_deps="vdpau" mpeg1_vdpau_decoder_deps="vdpau" -mpeg_xvmc_decoder_deps="xvmc X11_extensions_XvMClib_h" +mpeg_xvmc_decoder_deps="X11_extensions_XvMClibx_h" msmpeg4v1_encoder_select="aandct" msmpeg4v2_encoder_select="aandct" msmpeg4v3_encoder_select="aandct" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2c54522930..7026ada53b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -137,6 +137,7 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o mpegaudiod 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_WC3_DECODER) += xan.o 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 diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 8ba9461b4b..d97a96b334 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -563,7 +563,7 @@ static int is_intra_more_likely(MpegEncContext *s){ 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 @@ void ff_er_frame_end(MpegEncContext *s){ }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 @@ void ff_er_frame_end(MpegEncContext *s){ 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 */ diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 6100b1f55d..0e5d579d8d 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -301,7 +301,7 @@ static int mpeg_decode_mb(MpegEncContext *s, }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 @@ static int mpeg_decode_mb(MpegEncContext *s, 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 @@ static int mpeg_field_start(MpegEncContext *s){ } } } -#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 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, } 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 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) 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 @@ AVCodec mpegvideo_decoder = { .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; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5dc5e43e42..b88cea3c13 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -939,7 +939,7 @@ alloc: 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 @@ void MPV_frame_end(MpegEncContext *s) { 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 @@ 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_XVMC +#if CONFIG_MPEG_XVMC_DECODER if(s->avctx->xvmc_acceleration){ XVMC_decode_mb(s);//xvmc uses pblocks return; |