Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:56:03 +0000 (22:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:56:51 +0000 (22:56 +0200)
* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
  mov: Check memory allocation

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

Simple merge