Merge commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:52:17 +0000 (03:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:52:37 +0000 (03:52 +0100)
commitc75681aba343912c8878705448ad470a1bba2191
tree4f5d1aa5463d36407097eb046d76fd3b0126f56f
parenta821617b5a09321a4ff875f77ad95daf6942c0d1
parent93c1b04abfc0dd31211a18bf2c0041d69cd16919
Merge commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919'

* commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919':
  mms: Check memory allocation

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