[FFmpeg-cvslog] indeo3: avoid writes without necessary alignment in copy_cell()

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Thu May  9 14:53:03 2013 +0200| [94235f2ba2eb8be014b6dbc2b2aed494c169cef1] | committer: Janne Grunau

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94235f2ba2eb8be014b6dbc2b2aed494c169cef1
---

 libavcodec/indeo3.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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;