summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-11-01 21:41:28 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-11-01 21:41:28 +0000
commitad67a1081dbfac7ef538c07cea8b6fc198646ddc (patch)
treef8d458717fa49a8b3b84d28f6d2385e6aa1fa7b7 /gst
parent91b12107f6a134009995f01e0e923c24c7f5bd82 (diff)
downloadgst-plugins-bad-ad67a1081dbfac7ef538c07cea8b6fc198646ddc.tar.gz
gst-plugins-bad-ad67a1081dbfac7ef538c07cea8b6fc198646ddc.tar.bz2
gst-plugins-bad-ad67a1081dbfac7ef538c07cea8b6fc198646ddc.zip
backmerge
Original commit message from CVS: backmerge
Diffstat (limited to 'gst')
-rw-r--r--gst/mixmatrix/mixmatrix.c10
-rw-r--r--gst/smpte/paint.c1
2 files changed, 6 insertions, 5 deletions
diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c
index a8d5279f..12e6c1d6 100644
--- a/gst/mixmatrix/mixmatrix.c
+++ b/gst/mixmatrix/mixmatrix.c
@@ -176,14 +176,14 @@ mixmatrix_alloc_matrix (int x,int y)
{
gfloat **matrix;
int i;
- fprintf(stderr,"allocating a %dx%d matrix of floats\n",x,y);
+ GST_DEBUG(0,"mixmatrix: allocating a %dx%d matrix of floats\n",x,y);
matrix = g_new(gfloat *,x);
- fprintf(stderr,"%p: ",matrix);
+ GST_DEBUG(0,"mixmatrix: %p: ",matrix);
for (i=0;i<x;i++) {
matrix[i] = g_new(gfloat,y);
- fprintf(stderr,"%p, ",matrix[i]);
+ GST_DEBUG(0,"%p, ",matrix[i]);
}
- fprintf(stderr,"\n");
+ GST_DEBUG(0,"\n");
return matrix;
}
@@ -237,7 +237,7 @@ mixmatrix_resize(GstMixMatrix *mix, int sinkpads, int srcpads)
gfloat **newmatrix;
int i;
- fprintf(stderr,"resizing matrix!!!!\n");
+ GST_DEBUG(0,"mixmatrix: resizing matrix!!!!\n");
// check the sinkpads list
if (sinkresize) {
diff --git a/gst/smpte/paint.c b/gst/smpte/paint.c
index 07cffc4f..c04aba6f 100644
--- a/gst/smpte/paint.c
+++ b/gst/smpte/paint.c
@@ -18,6 +18,7 @@
*/
#include <math.h>
+#include <stdlib.h>
#include "paint.h"
void