diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-06 09:41:44 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-03-16 08:21:01 +0100 |
| commit | 6dbe9313445c79be3ee9a96a7ab5ffb76fa2f66b (patch) | |
| tree | b3df3661e2f35fd8cc39998f5c5c037fe91ee1e1 | |
| parent | 87e4f4c79a88212c4bc1a3e37a581ff88b9d9638 (diff) | |
| download | ffmpeg-6dbe9313445c79be3ee9a96a7ab5ffb76fa2f66b.tar.gz | |
ivi_common: do not call MC for intra frames when dc_transform is unset
CC:libav-stable@libav.org
(cherry picked from commit 3ba40ebb6cc58753dc3746c718203bb31760deba)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 74880e78d83031d612c941a383b810ff0c9d50c6)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/ivi_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 84705c4c62..00205ae8da 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -478,9 +478,10 @@ int ff_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, |