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)
commit3d6635749ab2f3507a73cb450038118ae561d74c
tree093587124b2f247ed01845eae72ac4159a9d3c65
parent77510a96986176b1be791944861e3a6e44abd3d1
parent6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5
Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'

* commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5':
  mov: Check memory allocation

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