diff options
author | Luc Trudeau <ltrudeau@twoorioles.com> | 2020-02-21 18:23:22 +0300 |
---|---|---|
committer | Luc Trudeau <ltrudeau@twoorioles.com> | 2020-02-21 19:01:54 +0300 |
commit | 296d1dc006419546f342606ff7d47564bd9798a8 (patch) | |
tree | 34bd5ba8d7f7b8d81c5a2d1ad23829c8503e4a39 /tools | |
parent | cacc8e350c4066ff1bb3ffb2cbf9813bd26d7baa (diff) |
cli: Replace malloc + memset(0) with calloc in input.c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/input/input.c | 3 | ||||
-rw-r--r-- | tools/input/ivf.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/input/input.c b/tools/input/input.c index 50d6145..d8a56c1 100644 --- a/tools/input/input.c +++ b/tools/input/input.c @@ -105,11 +105,10 @@ int input_open(DemuxerContext **const c_out, } } - if (!(c = malloc(sizeof(DemuxerContext) + impl->priv_data_size))) { + if (!(c = calloc(1, sizeof(DemuxerContext) + impl->priv_data_size))) { fprintf(stderr, "Failed to allocate memory\n"); return DAV1D_ERR(ENOMEM); } - memset(c, 0, sizeof(DemuxerContext) + impl->priv_data_size); c->impl = impl; c->data = (DemuxerPriv *) &c[1]; if ((res = impl->open(c->data, filename, fps, num_frames, timebase)) < 0) { diff --git a/tools/input/ivf.c b/tools/input/ivf.c index 15676b0..746391d 100644 --- a/tools/input/ivf.c +++ b/tools/input/ivf.c @@ -63,7 +63,6 @@ static int ivf_open(IvfInputContext *const c, const char *const file, size_t res; uint8_t hdr[32]; - memset(c, 0, sizeof(*c)); if (!(c->f = fopen(file, "rb"))) { fprintf(stderr, "Failed to open %s: %s\n", file, strerror(errno)); return -1; |