Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:03:54 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:04:03 +0000 (22:04 +0100)
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
  cmdutils: add a macro to simplify grow_array() calls.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c

diff --cc cmdutils.h
Simple merge
diff --cc ffmpeg_filter.c
@@@ -266,11 -157,10 +262,10 @@@ static void init_input_filter(FilterGra
      av_assert0(ist);
  
      ist->discard         = 0;
 -    ist->decoding_needed = 1;
 +    ist->decoding_needed++;
      ist->st->discard = AVDISCARD_NONE;
  
-     fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs),
-                             &fg->nb_inputs, fg->nb_inputs + 1);
+     GROW_ARRAY(fg->inputs, fg->nb_inputs);
      if (!(fg->inputs[fg->nb_inputs - 1] = av_mallocz(sizeof(*fg->inputs[0]))))
          exit(1);
      fg->inputs[fg->nb_inputs - 1]->ist   = ist;
diff --cc ffmpeg_opt.c
Simple merge