]> git.sesse.net Git - ffmpeg/commitdiff
avconv: use a local variable for InputFile in open_input_file().
authorAnton Khirnov <anton@khirnov.net>
Thu, 21 Feb 2013 08:53:28 +0000 (09:53 +0100)
committerAnton Khirnov <anton@khirnov.net>
Fri, 8 Mar 2013 13:13:46 +0000 (14:13 +0100)
This is shorter and more readable.

avconv_opt.c

index 1d641af80a4c5d5a61ae2d3731b6d0f4c55f1526..cd3f7f65b2305862a176b86d0e2c83487a2a5816 100644 (file)
@@ -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;