# HG changeset patch
# User reimar
# Date 1284295768 0
# Node ID e24003316c1cd332d7f36f2d7d0a49d84249d4f3
# Parent  04da24405c6c33a3ddbf0eadd41471ebed20c48d
Replace malloc+memset by calloc

diff -r 04da24405c6c -r e24003316c1c libmpdemux/demux_smjpeg.c
--- a/libmpdemux/demux_smjpeg.c	Sun Sep 12 12:41:37 2010 +0000
+++ b/libmpdemux/demux_smjpeg.c	Sun Sep 12 12:49:28 2010 +0000
@@ -129,8 +129,7 @@
 	    demuxer->video->sh = sh_video;
 	    sh_video->ds = demuxer->video;
 
-	    sh_video->bih = malloc(sizeof(BITMAPINFOHEADER));
-	    memset(sh_video->bih, 0, sizeof(BITMAPINFOHEADER));
+	    sh_video->bih = calloc(1, sizeof(BITMAPINFOHEADER));
 
 	    stream_skip(demuxer->stream, 4); /* number of frames */
 //	    sh_video->fps = 24;
@@ -154,8 +153,7 @@
 	    demuxer->audio->sh = sh_audio;
 	    sh_audio->ds = demuxer->audio;
 
-	    sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
-	    memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
+	    sh_audio->wf = calloc(1, sizeof(WAVEFORMATEX));
 
 	    sh_audio->samplerate = stream_read_word(demuxer->stream);
 	    sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream);