Fixed detection of linux framebuffer support. Included xineutils.h in dsputil_mlib.c and added to diff_to_ffmpeg_cvs.txt. Fixed function prototype in dsputil_mlib.c (should be sent back to ffmpeg-dev at some point). Fixed includes in nosefart. Fixed nested comments and includes in goom.

CVS patchset: 6180
CVS date: 2004/02/20 19:53:38

3 files changed, 33 insertions, 23 deletions

diff --git a/src/post/goom/filters.c b/src/post/goom/filters.c
index 5cc5e1af0..9ba2be3dc 100644
--- a/src/post/goom/filters.c
+++ b/src/post/goom/filters.c
@@ -12,13 +12,21 @@
 
 //#define _DEBUG_PIXEL;
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+
 #include "filters.h"
 #include "graphic.h"
 #include "goom_tools.h"
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdint.h>
 
 #ifdef HAVE_MMX
 #define USE_ASM
@@ -726,7 +734,7 @@ zoomFilterFastRGB (Uint * pix1,
         }
 /*
 	if (interlace_start>=0) {
-		/* creation de la nouvelle destination *
+		* creation de la nouvelle destination *
 		for (y = interlace_start; y < prevY; y+=INTERLACE_INCR) {
 			Uint premul_y_prevX = y * prevX * 2;
 			for (x = 0; x < prevX; x++) {
@@ -736,13 +744,13 @@ zoomFilterFastRGB (Uint * pix1,
 				
 				calculatePXandPY (x, y, &px, &py);
 				
-				/*				if (py>ay<<16)
+				*				if (py>ay<<16)
 									py = iRAND (32);
 									if (px>ax<<16)
 									px = iRAND (32);
 				*
 				
-				/*
+				*
 					if ((px == x << 4) && (py == y << 4)) {
 					if (x > middleX)
 					py += 2;
@@ -765,7 +773,6 @@ zoomFilterFastRGB (Uint * pix1,
 		if (interlace_start == 0)
 			interlace_start = -1;
 	}
-
 */
 
 	if (interlace_start>=0) {
diff --git a/src/post/goom/filters.h b/src/post/goom/filters.h
index f3f0c1957..935d13574 100644
--- a/src/post/goom/filters.h
+++ b/src/post/goom/filters.h
@@ -8,22 +8,17 @@
 
 typedef struct
 {
-	int     vitesse;							/* 128 = vitesse nule... * * 256 = en arriere 
-																 * hyper vite.. * * 0 = en avant hype vite. */
+	int     vitesse;		/* 128 = vitesse nule... * * 256 = en arriere * hyper vite.. * * 0 = en avant hype vite. */
 	unsigned char pertedec;
 	unsigned char sqrtperte;
-	int     middleX, middleY;			/* milieu de l'effet */
-	char    reverse;							/* inverse la vitesse */
-	char    mode;									/* type d'effet à appliquer (cf les #define)
-																 * * * * * /** @since June 2001 */
-	int     hPlaneEffect;					/* deviation horitontale */
-	int     vPlaneEffect;					/* deviation verticale */
-	/** @since April 2002 */
-	int     waveEffect;						/* applique une "surcouche" de wave effect */
-	int     hypercosEffect;				/* applique une "surcouche de hypercos effect 
-																 */
-
-	char    noisify;							/* ajoute un bruit a la transformation */
+	int     middleX, middleY;	/* milieu de l'effet */
+	char    reverse;		/* inverse la vitesse */
+	char    mode;			/* type d'effet à appliquer (cf les #define) */ /** @since June 2001 */
+	int     hPlaneEffect;		/* deviation horitontale */
+	int     vPlaneEffect;		/* deviation verticale */ /** @since April 2002 */
+	int     waveEffect;		/* applique une "surcouche" de wave effect */
+	int     hypercosEffect;		/* applique une "surcouche de hypercos effect */
+	char    noisify;		/* ajoute un bruit a la transformation */
 }
 ZoomFilterData;
 
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index c2a901780..1cda9f744 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -1,7 +1,15 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
+
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+
 #include "goom_core.h"
 #include "goom_tools.h"
 #include "filters.h"