ivi_common: do not call MC for intra frames when dc_transform is unset
authorAnton Khirnov <anton@khirnov.net>
Wed, 6 Mar 2013 08:41:44 +0000 (09:41 +0100)
committerAnton Khirnov <anton@khirnov.net>
Fri, 8 Mar 2013 07:11:46 +0000 (08:11 +0100)
CC:libav-stable@libav.org

libavcodec/ivi_common.c

index 3d7cd13..f068e45 100644 (file)
@@ -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,