diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 19:54:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 19:54:45 +0100 |
| commit | 78e39aa7ee12bb61cf34d8ca6bebd129d659d9cd (patch) | |
| tree | 7d3aed0445c3d2379842ea2a6dd39e3d3387ac3d /libavcodec/mpeg12dec.c | |
| parent | eef74b2e97139d8422f76a0f8241aed17fc0617d (diff) | |
| parent | b7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1 (diff) | |
| download | ffmpeg-78e39aa7ee12bb61cf34d8ca6bebd129d659d9cd.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a possible overflow when reading Nikon avi files.
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
| -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) |