[FFmpeg-cvslog] r17229 - in trunk: configure libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpeg12.c libavcodec/mpegvideo.c
diego
subversion
Sat Feb 14 16:37:41 CET 2009
Author: diego
Date: Sat Feb 14 16:37:40 2009
New Revision: 17229
Log:
Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
Modified:
trunk/configure
trunk/libavcodec/Makefile
trunk/libavcodec/error_resilience.c
trunk/libavcodec/mpeg12.c
trunk/libavcodec/mpegvideo.c
Modified: trunk/configure
==============================================================================
--- trunk/configure Sat Feb 14 16:30:40 2009 (r17228)
+++ trunk/configure Sat Feb 14 16:37:40 2009 (r17229)
@@ -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"
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Sat Feb 14 16:30:40 2009 (r17228)
+++ trunk/libavcodec/Makefile Sat Feb 14 16:37:40 2009 (r17229)
@@ -137,6 +137,7 @@ OBJS-$(CONFIG_MPC7_DECODER) +
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) +
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
Modified: trunk/libavcodec/error_resilience.c
==============================================================================
--- trunk/libavcodec/error_resilience.c Sat Feb 14 16:30:40 2009 (r17228)
+++ trunk/libavcodec/error_resilience.c Sat Feb 14 16:37:40 2009 (r17229)
@@ -563,7 +563,7 @@ static int is_intra_more_likely(MpegEncC
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 */
Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c Sat Feb 14 16:30:40 2009 (r17228)
+++ trunk/libavcodec/mpeg12.c Sat Feb 14 16:37:40 2009 (r17229)
@@ -301,7 +301,7 @@ static int mpeg_decode_mb(MpegEncContext
}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
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(MpegEncConte
}
}
}
-#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(Mpeg1Contex
}
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 *avc
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;
Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c Sat Feb 14 16:30:40 2009 (r17228)
+++ trunk/libavcodec/mpegvideo.c Sat Feb 14 16:37:40 2009 (r17229)
@@ -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(MpegEncConte
{
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;
More information about the ffmpeg-cvslog
mailing list