Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
fftools/ffmpeg_opt.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 3102851885..c22c6aca06 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -784,7 +784,7 @@ static void add_input_streams(OptionsContext *o,
AVFormatContext *ic)
for (i = 0; i < ic->nb_streams; i++) {
AVStream *st = ic->streams[i];
AVCodecParameters *par = st->codecpar;
- InputStream *ist = av_mallocz(sizeof(*ist));
+ InputStream *ist;
char *framerate = NULL, *hwaccel_device = NULL;
const char *hwaccel = NULL;
char *hwaccel_output_format = NULL;
@@ -795,12 +795,7 @@ static void add_input_streams(OptionsContext *o,
AVFormatContext *ic)
const AVOption *discard_opt = av_opt_find(&cc, "skip_frame", NULL,
0, AV_OPT_SEARCH_FAKE_OBJ);
- if (!ist)
- exit_program(1);
-
- GROW_ARRAY(input_streams, nb_input_streams);
- input_streams[nb_input_streams - 1] = ist;
-
+ ist = ALLOC_ARRAY_ELEM(input_streams, nb_input_streams);
ist->st = st;
ist->file_index = nb_input_files;
ist->discard = 1;
@@ -1445,10 +1440,7 @@ static OutputStream *new_output_stream(OptionsContext
*o, AVFormatContext *oc, e
if (oc->nb_streams - 1 < o->nb_streamid_map)
st->id = o->streamid_map[oc->nb_streams - 1];
- GROW_ARRAY(output_streams, nb_output_streams);
- if (!(ost = av_mallocz(sizeof(*ost))))
- exit_program(1);
- output_streams[nb_output_streams - 1] = ost;
+ ost = ALLOC_ARRAY_ELEM(output_streams, nb_output_streams);
ost->file_index = nb_output_files - 1;
ost->index = idx;
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
