diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-18 06:41:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-18 06:41:55 +0400 |
| commit | 973cb29d841a37f0c101cc20433329a83400d894 (patch) | |
| tree | c512994e0a7ae379f044cfacc3e4ea939e438ba0 /source/blender/avi/intern/avi_rgb.c | |
| parent | b867f9f17eb1af2051749190aa6aee708972af82 (diff) | |
style cleanup: if's on the same line.
Diffstat (limited to 'source/blender/avi/intern/avi_rgb.c')
| -rw-r--r-- | source/blender/avi/intern/avi_rgb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/avi/intern/avi_rgb.c b/source/blender/avi/intern/avi_rgb.c index 11d9bdf8612..c6a78eccce2 100644 --- a/source/blender/avi/intern/avi_rgb.c +++ b/source/blender/avi/intern/avi_rgb.c @@ -98,7 +98,7 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf buf = MEM_mallocN(movie->header->Height * movie->header->Width * 3, "fromavirgbbuf"); rowstride = movie->header->Width * 3; - if (bits != 16) if (movie->header->Width % 2) rowstride++; + if ((bits != 16) && (movie->header->Width % 2)) rowstride++; for (y = 0; y < movie->header->Height; y++) { memcpy(&buf[y * movie->header->Width * 3], &buffer[((movie->header->Height - 1) - y) * rowstride], movie->header->Width * 3); |