From: Janne Grunau <janne-libav@jannau.net>
Date: Thu, 9 May 2013 12:53:03 +0000 (+0200)
Subject: indeo3: avoid writes without necessary alignment in copy_cell()
X-Git-Tag: v10_alpha1~1587
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94235f2ba2eb8be014b6dbc2b2aed494c169cef1;p=platform%2Fupstream%2Flibav.git

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.
---

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 3a816b7..f9bfc0e 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;