From c892621577b3ff1d34215b4b41899514658e0926 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 20 Jan 2014 11:20:46 +0100 Subject: [PATCH] Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc --- libavcodec/mpeg12dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index de6b2b6859..08e6bff56c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -770,7 +770,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ s->mb_intra = 1; // if 1, we memcpy blocks in xvmcvideo - if (CONFIG_XVMC && s->pack_pblocks) { + if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks) { ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks } @@ -986,7 +986,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } //if 1, we memcpy blocks in xvmcvideo - if (CONFIG_XVMC && s->pack_pblocks) { + if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks) { ff_xvmc_pack_pblocks(s, cbp); } @@ -1700,7 +1700,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, for (;;) { // If 1, we memcpy blocks in xvmcvideo. - if (CONFIG_XVMC && s->pack_pblocks) + if ((CONFIG_MPEG1_XVMC_HWACCEL || CONFIG_MPEG2_XVMC_HWACCEL) && s->pack_pblocks) ff_xvmc_init_block(s); // set s->block if (mpeg_decode_mb(s, s->block) < 0)