[Bf-committers] Correct (hopefully) Linux AVI_JPEG Bugfix

Robert Wenzlaff bf-committers@blender.org
Fri, 22 Nov 2002 08:37:40 -0500


--------------Boundary-00=_SICZGH5IL3FW4PTUQZTK
Content-Type: text/plain;
  charset="windows-1252"
Content-Transfer-Encoding: quoted-printable

Hopefully this will send the diff w/o formatting it....
To be sure I'll attach it, too.

My CVS tree isn't up to date, so I don't know if I should check this in (=
Not
even sure I have access).  But here's a diff.

The Linux Version of 2.25 does not make AVI_JPEGS.  If Avi Jpeg is select=
ed,
it makes an Avi Raw instead.

Cause:  blender/src/buttons.c and blender/blenkernel/intern/writeavi.c us=
e
different defines for anim type.

Fix:

--- writeavi.c  Sun Oct 13 11:57:02 2002
+++ writeavi2.c Fri Nov 22 01:06:22 2002
@@ -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=3DNULL;
 static int sframe;

@@ -88,7 +92,9 @@

        avi =3D MEM_mallocN (sizeof(AviMovie), "avimovie");

-       if (R.r.imtype !=3D AVI_FORMAT_MJPEG) format =3D AVI_FORMAT_AVI_R=
GB;
+/* RPW 11-21-2002 */
+       if (R.r.imtype !=3D R_AVIJPEG ) format =3D AVI_FORMAT_AVI_RGB;
+/* RPW - End */
        else format =3D AVI_FORMAT_MJPEG;

        if (AVI_open_compress (name, avi, 1, format) !=3D AVI_ERROR_NONE)=
 {



--=20
********************************************
       I prefer Rush to G. Gordon Liddy.
        After all, the Watergate Tapes
        can't hold a candle to either=20
         "2112" or "Moving Pictures".
********************************************
Robert Wenzlaff  rwenzlaff@soylent-green.com

--------------Boundary-00=_SICZGH5IL3FW4PTUQZTK
Content-Type: text/x-diff;
  charset="windows-1252";
  name="avijpeg.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="avijpeg.diff"

--- writeavi.c  Sun Oct 13 11:57:02 2002
+++ writeavi2.c Fri Nov 22 01:06:22 2002
@@ -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,9 @@

        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 != R_AVIJPEG ) format = AVI_FORMAT_AVI_RGB;
+/* RPW - End */
        else format = AVI_FORMAT_MJPEG;

        if (AVI_open_compress (name, avi, 1, format) != AVI_ERROR_NONE) {



--------------Boundary-00=_SICZGH5IL3FW4PTUQZTK--