diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-02-14 15:37:40 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-14 15:37:40 +0000 |
| commit | fc2dd7e3defcba84ffe36ddf1452170f85143129 (patch) | |
| tree | 586f919afe784243d05c4c190ebee040391a624f /libavcodec/mpeg12.c | |
| parent | 9e477960489d3296f023c64d6cc43073953aedf3 (diff) | |
| download | ffmpeg-fc2dd7e3defcba84ffe36ddf1452170f85143129.tar.gz | |
Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
Originally committed as revision 17229 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 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; |