diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 11:20:46 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 11:20:46 +0100 |
| commit | c892621577b3ff1d34215b4b41899514658e0926 (patch) | |
| tree | 6e9d9a5f2df503afc2a8e701601b080011af1195 | |
| parent | 4014b401b0d55f27b7c430962b63f6b3fbf834c5 (diff) | |
| download | ffmpeg-c892621577b3ff1d34215b4b41899514658e0926.tar.gz | |
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
| -rw-r--r-- | libavcodec/mpeg12dec.c | 6 |
1 files 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) |