1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
https://github.com/FFmpeg/FFmpeg/commit/1ea365082318f06cd42a8b37dd0c7724b599c821
diff --git a/ffplay_cpp/cmdutils.c b/ffplay_cpp/cmdutils.c
index 49fe9f8..f843e82 100644
--- a/ffplay_cpp/cmdutils.c
+++ b/ffplay_cpp/cmdutils.c
@@ -718,7 +718,7 @@ static void init_parse_context(OptionParseContext *octx,
memset(octx, 0, sizeof(*octx));
octx->nb_groups = nb_groups;
- octx->groups = av_mallocz_array(octx->nb_groups, sizeof(*octx->groups));
+ octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups));
if (!octx->groups)
exit_program(1);
@@ -2155,7 +2155,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
if (!s->nb_streams)
return NULL;
- opts = av_mallocz_array(s->nb_streams, sizeof(*opts));
+ opts = av_calloc(s->nb_streams, sizeof(*opts));
if (!opts) {
av_log(NULL, AV_LOG_ERROR,
"Could not alloc memory for stream options.\n");
diff --git a/src/server/ffplay/cmdutils.c.bak b/src/server/ffplay/cmdutils.c.bak
index 0e8561a..ab0b166 100644
--- a/src/server/ffplay/cmdutils.c.bak
+++ b/src/server/ffplay/cmdutils.c.bak
@@ -719,7 +719,7 @@ static void init_parse_context(OptionParseContext *octx,
memset(octx, 0, sizeof(*octx));
octx->nb_groups = nb_groups;
- octx->groups = av_mallocz_array(octx->nb_groups, sizeof(*octx->groups));
+ octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups));
if (!octx->groups)
exit_program(1);
diff --git a/src/server/ffplay/stream_handler.cpp b/src/server/ffplay/stream_handler.cpp
index f6db69a..27d9fcd 100644
--- a/src/server/ffplay/stream_handler.cpp
+++ b/src/server/ffplay/stream_handler.cpp
@@ -137,7 +137,7 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *cod
int i;
AVDictionary **opts;
if (!s->nb_streams) { return NULL; }
- opts = (AVDictionary**) av_mallocz_array(s->nb_streams, sizeof(*opts));
+ opts = (AVDictionary**) av_calloc(s->nb_streams, sizeof(*opts));
if (!opts) {
av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n");
return NULL;
|
