[MPlayer-cvslog] CVS: main/libmpcodecs ve_divx4.c, 1.15, 1.16 ve_libdv.c, 1.10, 1.11 ve_nuv.c, 1.3, 1.4 ve_qtvideo.c, 1.11, 1.12 ve_raw.c, 1.3, 1.4 ve_vfw.c, 1.16, 1.17 ve_xvid.c, 1.27, 1.28 ve_xvid4.c, 1.11, 1.12

Reimar Döffinger CVS syncmail at mplayerhq.hu
Thu Jan 20 23:53:39 CET 2005


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv23612

Modified Files:
	ve_divx4.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c ve_vfw.c 
	ve_xvid.c ve_xvid4.c 
Log Message:
Initialized BITMAPINFOHEADER to 0 to avoid problems, esp. windows has problems
when unused parts have bogus values.


Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ve_divx4.c	24 Mar 2004 15:16:36 -0000	1.15
+++ ve_divx4.c	20 Jan 2005 22:53:37 -0000	1.16
@@ -463,7 +463,7 @@
     memset(vf->priv,0,sizeof(struct vf_priv_s));
     vf->priv->mux=(muxer_stream_t*)args;
 
-    mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
+    mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
     mux_v->bih->biWidth=0;
     mux_v->bih->biHeight=0;

Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ve_libdv.c	24 Mar 2004 15:16:36 -0000	1.10
+++ ve_libdv.c	20 Jan 2005 22:53:37 -0000	1.11
@@ -95,7 +95,7 @@
     vf->priv->enc=dv_encoder_new(0,1,1); // FIXME, parse some options!
     if(!vf->priv->enc) return 0;
     
-    mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
+    mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
     mux_v->bih->biWidth=0;
     mux_v->bih->biHeight=0;

Index: ve_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_nuv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ve_nuv.c	24 Mar 2004 15:16:36 -0000	1.3
+++ ve_nuv.c	20 Jan 2005 22:53:37 -0000	1.4
@@ -200,7 +200,7 @@
   memcpy(vf->priv, &nuv_priv_dflt,sizeof(struct vf_priv_s));
   vf->priv->mux=(muxer_stream_t*)args;
   
-  mux_v->bih=malloc(sizeof(BITMAPINFOHEADER));
+  mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER));
   mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
   mux_v->bih->biWidth=0;
   mux_v->bih->biHeight=0;

Index: ve_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_qtvideo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ve_qtvideo.c	17 Jan 2005 20:57:48 -0000	1.11
+++ ve_qtvideo.c	20 Jan 2005 22:53:37 -0000	1.12
@@ -285,7 +285,7 @@
     memset(vf->priv,0,sizeof(struct vf_priv_s));
     vf->priv->mux=(muxer_stream_t*)args;
 
-    mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+MAX_IDSIZE);
+    mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER)+MAX_IDSIZE);
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER)+MAX_IDSIZE;
     mux_v->bih->biWidth=0;
     mux_v->bih->biHeight=0;

Index: ve_raw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_raw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ve_raw.c	2 Jan 2005 20:01:20 -0000	1.3
+++ ve_raw.c	20 Jan 2005 22:53:37 -0000	1.4
@@ -133,7 +133,7 @@
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
     vf->priv->mux = (muxer_stream_t*)args;
     
-    mux_v->bih = malloc(sizeof(BITMAPINFOHEADER));
+    mux_v->bih = calloc(1, sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize = sizeof(BITMAPINFOHEADER);
     mux_v->bih->biWidth = 0;
     mux_v->bih->biHeight = 0;

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ve_vfw.c	24 Mar 2004 15:16:36 -0000	1.16
+++ ve_vfw.c	20 Jan 2005 22:53:37 -0000	1.17
@@ -258,7 +258,7 @@
     memset(vf->priv,0,sizeof(struct vf_priv_s));
     vf->priv->mux=(muxer_stream_t*)args;
 
-    vfw_bih=malloc(sizeof(BITMAPINFOHEADER));
+    vfw_bih=calloc(1, sizeof(BITMAPINFOHEADER));
     vfw_bih->biSize=sizeof(BITMAPINFOHEADER);
     vfw_bih->biWidth=0; // FIXME ?
     vfw_bih->biHeight=0;

Index: ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ve_xvid.c	24 Mar 2004 15:16:36 -0000	1.27
+++ ve_xvid.c	20 Jan 2005 22:53:37 -0000	1.28
@@ -547,7 +547,7 @@
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
     vf->priv->mux = (muxer_stream_t*)args;
 
-    vf->priv->mux->bih = malloc(sizeof(BITMAPINFOHEADER));
+    vf->priv->mux->bih = calloc(1, sizeof(BITMAPINFOHEADER));
     vf->priv->mux->bih->biSize = sizeof(BITMAPINFOHEADER);
     vf->priv->mux->bih->biWidth = 0;
     vf->priv->mux->bih->biHeight = 0;

Index: ve_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ve_xvid4.c	2 Nov 2004 17:22:24 -0000	1.11
+++ ve_xvid4.c	20 Jan 2005 22:53:37 -0000	1.12
@@ -570,7 +570,7 @@
 	mod->mux = (muxer_stream_t*)args;
 
 	/* Initialize muxer BITMAP header */
-	mod->mux->bih = malloc(sizeof(BITMAPINFOHEADER));
+	mod->mux->bih = calloc(1, sizeof(BITMAPINFOHEADER));
 
 	if(mod->mux->bih  == NULL) {
 		mp_msg(MSGT_MENCODER,MSGL_ERR,




More information about the MPlayer-cvslog mailing list