aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ivi_common.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-06 09:41:44 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-08 08:11:46 +0100
commit3ba40ebb6cc58753dc3746c718203bb31760deba (patch)
tree13db6c5b0358f4aa1659456ac66c3f2b69c64d3a /libavcodec/ivi_common.c
parent3e2f200237af977b9253b0aff121eee27bcedb44 (diff)
downloadffmpeg-3ba40ebb6cc58753dc3746c718203bb31760deba.tar.gz
ivi_common: do not call MC for intra frames when dc_transform is unset
CC:libav-stable@libav.org
Diffstat (limited to 'libavcodec/ivi_common.c')
-rw-r--r--libavcodec/ivi_common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 3d7cd13b7f..f068e45e89 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -527,9 +527,10 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile
/* block not coded */
/* for intra blocks apply the dc slant transform */
/* for inter - perform the motion compensation without delta */
- if (is_intra && band->dc_transform) {
- band->dc_transform(&prev_dc, band->buf + buf_offs,
- band->pitch, blk_size);
+ if (is_intra) {
+ if (band->dc_transform)
+ band->dc_transform(&prev_dc, band->buf + buf_offs,
+ band->pitch, blk_size);
} else
mc_no_delta_func(band->buf + buf_offs,
band->ref_buf + buf_offs + mv_y * band->pitch + mv_x,