Mercurial > mplayer.hg
changeset 20130:b5c68feff55c
replace malloc+memset by calloc
| author | reimar |
|---|---|
| date | Mon, 09 Oct 2006 18:00:54 +0000 |
| parents | 053ed52b8951 |
| children | a16eef9ffef6 |
| files | libmpdemux/demux_mkv.c |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c Mon Oct 09 17:48:43 2006 +0000 +++ b/libmpdemux/demux_mkv.c Mon Oct 09 18:00:54 2006 +0000 @@ -1007,8 +1007,7 @@ uint64_t len, length, l; int il; - track = malloc (sizeof (*track)); - memset(track, 0, sizeof(*track)); + track = calloc (1, sizeof (*track)); /* set default values */ track->default_track = 1; track->name = 0; @@ -1769,8 +1768,7 @@ return 1; src = (BITMAPINFOHEADER *) track->private_data; - bih = malloc (track->private_size); - memset (bih, 0, track->private_size); + bih = calloc (1, track->private_size); bih->biSize = le2me_32 (src->biSize); bih->biWidth = le2me_32 (src->biWidth); bih->biHeight = le2me_32 (src->biHeight); @@ -1793,8 +1791,7 @@ } else { - bih = malloc (sizeof (BITMAPINFOHEADER)); - memset (bih, 0, sizeof (BITMAPINFOHEADER)); + bih = calloc (1, sizeof (BITMAPINFOHEADER)); bih->biSize = sizeof (BITMAPINFOHEADER); bih->biWidth = track->v_width; bih->biHeight = track->v_height; @@ -2432,8 +2429,7 @@ mp_msg (MSGT_DEMUX, MSGL_V, "[mkv] + a segment...\n"); - mkv_d = malloc (sizeof (mkv_demuxer_t)); - memset (mkv_d, 0, sizeof(mkv_demuxer_t)); + mkv_d = calloc (1, sizeof (mkv_demuxer_t)); demuxer->priv = mkv_d; mkv_d->tc_scale = 1000000; mkv_d->segment_start = stream_tell (s);