summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_smjpeg.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/demux_smjpeg.c')
-rw-r--r--libmpdemux/demux_smjpeg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c
index b7cf056fbe..8933e8c8f5 100644
--- a/libmpdemux/demux_smjpeg.c
+++ b/libmpdemux/demux_smjpeg.c
@@ -128,8 +128,7 @@ static demuxer_t* demux_open_smjpeg(demuxer_t* demuxer){
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(*sh_video->bih));
stream_skip(demuxer->stream, 4); /* number of frames */
// sh_video->fps = 24;
@@ -153,8 +152,7 @@ static demuxer_t* demux_open_smjpeg(demuxer_t* demuxer){
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(*sh_audio->wf));
sh_audio->samplerate = stream_read_word(demuxer->stream);
sh_audio->wf->wBitsPerSample = stream_read_char(demuxer->stream);