diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-12-15 22:22:51 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-12-15 22:22:51 +0000 |
| commit | b24298badc05dddeb87dbe9f12f29842ebec60f3 (patch) | |
| tree | 2db8c35574813b200cfec26775e0f7c02c40de4f /libavcodec/mpeg12.c | |
| parent | 6915cf38542828488b1129e6ce6207d5e5699798 (diff) | |
Switch xvmc over to a CONFIG_ option.
Originally committed as revision 16153 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 3122bb191c..672a4add44 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -303,7 +303,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; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,-1);//inter are always full blocks @@ -516,7 +516,7 @@ static int mpeg_decode_mb(MpegEncContext *s, return -1; } -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,cbp); @@ -1639,7 +1639,7 @@ static int mpeg_field_start(MpegEncContext *s){ } } } -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC // MPV_frame_start will call this function too, // but we need to call it on every field if(s->avctx->xvmc_acceleration) @@ -1730,7 +1730,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, } for(;;) { -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC //If 1, we memcpy blocks in xvmcvideo. if(s->avctx->xvmc_acceleration > 1) XVMC_init_block(s);//set s->block @@ -1912,7 +1912,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) return 0; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC if(s->avctx->xvmc_acceleration) XVMC_field_end(s); #endif @@ -2472,7 +2472,7 @@ AVCodec mpegvideo_decoder = { .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){ Mpeg1Context *s; |