diff options
| -rw-r--r-- | avconv_opt.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index 1d641af80a..cd3f7f65b2 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -546,6 +546,7 @@ static void dump_attachment(AVStream *st, const char *filename) static int open_input_file(OptionsContext *o, const char *filename) { + InputFile *f; AVFormatContext *ic; AVInputFormat *file_iformat = NULL; int err, i, ret; @@ -654,14 +655,16 @@ static int open_input_file(OptionsContext *o, const char *filename) av_dump_format(ic, nb_input_files, filename, 0); GROW_ARRAY(input_files, nb_input_files); - if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0])))) + f = av_mallocz(sizeof(*f)); + if (!f) exit(1); + input_files[nb_input_files - 1] = f; - input_files[nb_input_files - 1]->ctx = ic; - input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams; - input_files[nb_input_files - 1]->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); - input_files[nb_input_files - 1]->nb_streams = ic->nb_streams; - input_files[nb_input_files - 1]->rate_emu = o->rate_emu; + f->ctx = ic; + f->ist_index = nb_input_streams - ic->nb_streams; + f->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); + f->nb_streams = ic->nb_streams; + f->rate_emu = o->rate_emu; for (i = 0; i < o->nb_dump_attachment; i++) { int j; |