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)
* commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919':
  mms: Check memory allocation

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

Simple merge