diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:15:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:15:08 +0100 |
| commit | 7787a6c7caa0a3bdca3b479286def754e6f56cf0 (patch) | |
| tree | 0a77c8060fd87f6e2a6d0cae72907bcf9d2e5742 /libavcodec/ivi_common.c | |
| parent | 6ec0447d3d220bc113a69fac04f8b2a423342479 (diff) | |
| parent | cacad1c058f66558ec727faac3b277d2dee264d4 (diff) | |
| download | ffmpeg-7787a6c7caa0a3bdca3b479286def754e6f56cf0.tar.gz | |
Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'
* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
wmaprodec: require block_align to be set.
wmadec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.c')
| -rw-r--r-- | libavcodec/ivi_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index a3dfc0e57b..8dd89400b5 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -538,8 +538,8 @@ static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile /* for intra blocks apply the dc slant transform */ /* for inter - perform the motion compensation without delta */ if (is_intra) { - band->dc_transform(&prev_dc, band->buf + buf_offs, - band->pitch, blk_size); + 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, |