diff options
Diffstat (limited to 'source/blender/avi/intern/mjpeg.c')
| -rw-r--r-- | source/blender/avi/intern/mjpeg.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/mjpeg.c index fd7e8aaef83..c6295e2e49e 100644 --- a/source/blender/avi/intern/mjpeg.c +++ b/source/blender/avi/intern/mjpeg.c @@ -1,10 +1,8 @@ -/** - * mjpeg.c +/* + * $Id$ * * This is external code. Converts between avi and mpeg/jpeg. * - * $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> @@ -144,6 +143,8 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign unsigned int y; struct jpeg_decompress_struct dinfo; struct jpeg_error_mgr jerr; + + (void)width; /* unused */ numbytes= 0; @@ -324,7 +325,9 @@ static void check_and_compress_jpeg(int quality, unsigned char *outbuf, unsigned void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size) { int deint; unsigned char *buf; - + + (void)stream; /* unused */ + buf= MEM_mallocN (movie->header->Height * movie->header->Width * 3, "avi.avi_converter_from_mjpeg 1"); deint= check_and_decode_jpeg(buffer, buf, movie->header->Width, movie->header->Height, *size); @@ -374,10 +377,11 @@ void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer /* Compression from memory */ static void jpegmemdestmgr_init_destination(j_compress_ptr cinfo) { - ; + (void)cinfo; /* unused */ } static boolean jpegmemdestmgr_empty_output_buffer(j_compress_ptr cinfo) { + (void)cinfo; /* unused */ return TRUE; } @@ -403,7 +407,7 @@ static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, in /* Decompression from memory */ static void jpegmemsrcmgr_init_source(j_decompress_ptr dinfo) { - ; + (void)dinfo; } static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo) { |