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)
commit330983b728cceaf8f18557f23e333375a76f1a73
treececbaa72dd42c52833e8a1b57fdc018eb357cebd
parentf61498e1dfbac9f07f826340c00f9caf7235766c
parent10bca66101b79954512cd9d8ee20c3bc4513adf3
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'

* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
  cmdutils: add a macro to simplify grow_array() calls.

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