aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/indeo3.c
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2013-05-09 14:53:03 +0200
committerJanne Grunau <janne-libav@jannau.net>2013-05-10 12:02:09 +0200
commit94235f2ba2eb8be014b6dbc2b2aed494c169cef1 (patch)
tree5e1a9ecd4bce81bb20ba8f69f36a44e09b77bc01 /libavcodec/indeo3.c
parent2c299d4165cd9653153e12270971c2368551b79e (diff)
downloadffmpeg-94235f2ba2eb8be014b6dbc2b2aed494c169cef1.tar.gz
indeo3: avoid writes without necessary alignment in copy_cell()
Cells starting at a position aligned to 8 pixels but wider than 4 blocks are copied with 3 blocks per loop. This creates problems on the next loop iterations since the routine copying 2 blocks requires the same alignment on some architectures like ARM NEON.
Diffstat (limited to 'libavcodec/indeo3.c')
-rw-r--r--libavcodec/indeo3.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 3a816b76eb..f9bfc0eb5d 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -260,9 +260,7 @@ static int copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
w -= 2;
src += 8;
dst += 8;
- }
-
- if (w >= 1) {
+ } else if (w >= 1) {
ctx->hdsp.put_pixels_tab[2][0](dst, src, plane->pitch, h);
w--;
src += 4;