diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/avi/intern/rgb32.c | |
parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/avi/intern/rgb32.c')
-rw-r--r-- | source/blender/avi/intern/rgb32.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/avi/intern/rgb32.c b/source/blender/avi/intern/rgb32.c index 68e3ce4d1d2..1b1703a3cec 100644 --- a/source/blender/avi/intern/rgb32.c +++ b/source/blender/avi/intern/rgb32.c @@ -1,10 +1,8 @@ -/** - * rgb32.c +/* + * $Id$ * * This is external code. Converts between rgb32 and avi. * - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -29,7 +27,8 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * */ + * + */ #include "AVI_avi.h" #include <stdlib.h> @@ -41,6 +40,8 @@ void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buff int y, x, rowstridea, rowstrideb; unsigned char *buf; + (void)stream; /* unused */ + buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromrgb32buf"); *size = movie->header->Height * movie->header->Width * 3; @@ -65,6 +66,8 @@ void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer unsigned char *buf; unsigned char *to, *from; + (void)stream; /* unused */ + buf= MEM_mallocN (movie->header->Height * movie->header->Width * 4, "torgb32buf"); *size= movie->header->Height * movie->header->Width * 4; |