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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |