From fa92a6aad53aa03a75e2ab9d4d2d6f99513bf9c7 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 5 Oct 2006 21:31:21 +0000 Subject: Simplify: replace malloc + memset 0 by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 5630df7f69..fec76aabb9 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -213,8 +213,7 @@ sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){ } else { sh_audio_t *sh; mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id); - demuxer->a_streams[id]=malloc(sizeof(sh_audio_t)); - memset(demuxer->a_streams[id],0,sizeof(sh_audio_t)); + demuxer->a_streams[id]=calloc(1, sizeof(sh_audio_t)); sh = demuxer->a_streams[id]; // set some defaults sh->samplesize=2; @@ -246,8 +245,7 @@ sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid){ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_VideoStreamRedefined,id); } else { mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id); - demuxer->v_streams[id]=malloc(sizeof(sh_video_t)); - memset(demuxer->v_streams[id],0,sizeof(sh_video_t)); + demuxer->v_streams[id]=calloc(1, sizeof(sh_video_t)); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); } ((sh_video_t *)demuxer->v_streams[id])->vid = vid; -- cgit v1.2.3