Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 08:44:58 +0000 (10:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 08:50:47 +0000 (10:50 +0200)
commita7630e3755deb3d19469e6e05dd23690caf98eb8
treee0d98bea759f601c2066a3d5b0f1733f8abca212
parenta927276fcc20c99f6e311fb9aa679d4ba1ba7e99
parentb698542ad83284fbb8c22404e3cafeb2dd739d38
Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'

* commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38':
  mov: Don't allocate arrays with av_malloc that will be realloced

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