diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/avi/intern/mjpeg.c | |
parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/avi/intern/mjpeg.c')
-rw-r--r-- | source/blender/avi/intern/mjpeg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/mjpeg.c index d7212e710e9..fd7e8aaef83 100644 --- a/source/blender/avi/intern/mjpeg.c +++ b/source/blender/avi/intern/mjpeg.c @@ -40,10 +40,6 @@ #include "mjpeg.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #define PADUP(num, amt) ((num+(amt-1))&~(amt-1)) static void jpegmemdestmgr_build (j_compress_ptr cinfo, unsigned char *buffer, int bufsize); |