Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:33:19 +0000 (11:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:33:25 +0000 (11:33 +0200)
commit606e8baf0fec23140f2a1baffb8752cb761039f5
tree0f0dfda212ee815770451a52d4656ad1ebbfc05c
parent28ce9c0b73c5c4aea4cdaa1f584e7c0839286a35
parent7c020e1ad37d27c9d5db4d714401f09c80e3cc44
Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44'

* commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44':
  movenc: Grow the frag_info array in chunks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h