diff options
| author | Kent Mein <mein@cs.umn.edu> | 2002-11-22 18:59:38 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2002-11-22 18:59:38 +0300 |
| commit | d44f2c6dcc8fbd38790166da79e930e6d79abd08 (patch) | |
| tree | a6c8aadff1b03abc052091065e7279781e9f8a3e | |
| parent | 1f0fff0dc555dd927bc7b5f3c2d0ef549351fed2 (diff) | |
Robert Wenzlaff's fix for AVI_JPEGS.
Kent
--
mein@cs.umn.edu
| -rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 109553c816e..49d4f5a6f40 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -27,7 +27,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): none yet. + * Contributor(s): Robert Wenzlaff * * ***** END GPL/BL DUAL LICENSE BLOCK ***** * @@ -50,6 +50,10 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +/* RPW 11-21-2002 */ +#include "DNA_scene_types.h" +/* RPW - End */ + static AviMovie *avi=NULL; static int sframe; @@ -88,7 +92,10 @@ void start_avi(void) avi = MEM_mallocN (sizeof(AviMovie), "avimovie"); - if (R.r.imtype != AVI_FORMAT_MJPEG) format = AVI_FORMAT_AVI_RGB; + /* RPW 11-21-2002 + if (R.r.imtype != AVI_FORMAT_MJPEG) format = AVI_FORMAT_AVI_RGB; + */ + if (R.r.imtype != R_AVIJPEG ) format = AVI_FORMAT_AVI_RGB; else format = AVI_FORMAT_MJPEG; if (AVI_open_compress (name, avi, 1, format) != AVI_ERROR_NONE) { |