RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream: change malloc+memset to calloc 

Also removed some memset that were left on some calloc that was already in
the code.

Signed-off-by: wm4 <wm4@nowhere>
This commit is contained in:
Bruno George Moraes 2014-09-26 11:00:40 -03:00 committed by wm4
parent 650af29471
commit acf6aef882
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stream/stream.c
View File

@ -238,9 +238,7 @@ static bool parse_url(struct stream *st, struct m_config *config)
static stream_t *new_stream(void)
{
stream_t *s = talloc_size(NULL, sizeof(stream_t) + TOTAL_BUFFER_SIZE);
memset(s, 0, sizeof(stream_t));
return s;
return talloc_zero_size(NULL, sizeof(stream_t) + TOTAL_BUFFER_SIZE);
}
static const char *match_proto(const char *url, const char *proto)

3
stream/stream_cdda.c
View File

@ -314,8 +314,7 @@ static int open_cdda(stream_t *st)
return STREAM_ERROR;
}
priv = malloc(sizeof(cdda_priv));
memset(priv, 0, sizeof(cdda_priv));
priv = calloc(1,sizeof(cdda_priv));
priv->cd = cdd;
if (p->toc_bias)

3
stream/tvi_v4l2.c
View File

@ -1350,8 +1350,6 @@ static int start(priv_t *priv)
MP_ERR(priv, "cannot allocate video buffer: %s\n", strerror(errno));
return 0;
}
memset(priv->video_ringbuffer,0,priv->video_buffer_size_max * sizeof(video_buffer_entry));
pthread_mutex_init(&priv->video_buffer_mutex, NULL);
priv->video_head = 0;
@ -1382,7 +1380,6 @@ static int start(priv_t *priv)
/* map and queue buffers */
for (i = 0; i < request.count; i++) {
memset(&priv->map[i].buf,0,sizeof(priv->map[i].buf));
priv->map[i].buf.index = i;
priv->map[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
priv->map[i].buf.memory = V4L2_MEMORY_MMAP;