# HG changeset patch
# User reimar
# Date 1284293544 0
# Node ID 522a5ab34d2fe6619a87fd310c3a39d6a21a461b
# Parent  258df656f1ff0a18b326fe44550678b6df5548e4
Replace malloc+memset by calloc.

diff -r 258df656f1ff -r 522a5ab34d2f libmpdemux/demux_viv.c
--- a/libmpdemux/demux_viv.c	Sun Sep 12 11:44:42 2010 +0000
+++ b/libmpdemux/demux_viv.c	Sun Sep 12 12:12:24 2010 +0000
@@ -614,8 +614,7 @@
 		    sh->disp_h = height;
 
 		// emulate BITMAPINFOHEADER:
-		sh->bih=malloc(sizeof(BITMAPINFOHEADER));
-		memset(sh->bih,0,sizeof(BITMAPINFOHEADER));
+		sh->bih=calloc(1, sizeof(BITMAPINFOHEADER));
 		sh->bih->biSize=40;
 		if (priv->width)
 		    sh->bih->biWidth = priv->width;
@@ -679,8 +678,7 @@
 		}
 
 		// Emulate WAVEFORMATEX struct:
-		sh->wf=malloc(sizeof(WAVEFORMATEX));
-		memset(sh->wf,0,sizeof(WAVEFORMATEX));
+		sh->wf=calloc(1, sizeof(WAVEFORMATEX));
 		sh->wf->wFormatTag=sh->format;
 		sh->wf->nChannels=1; /* 1 channels for both Siren and G.723 */