diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 23:26:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 23:26:32 +0200 |
| commit | 496f2df9084b98e27971beef4c1ea8de8e21cd69 (patch) | |
| tree | 4f4bec37ea5b4ff2551af6e9443a3242f02c9831 /libavcodec/indeo3.c | |
| parent | 5e1278c6401a5e9aef040dd1f458facba4db7e51 (diff) | |
| parent | 94235f2ba2eb8be014b6dbc2b2aed494c169cef1 (diff) | |
| download | ffmpeg-496f2df9084b98e27971beef4c1ea8de8e21cd69.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: avoid writes without necessary alignment in copy_cell()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo3.c')
| -rw-r--r-- | libavcodec/indeo3.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 5ec4b9027d..a6658b717d 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -267,9 +267,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; |