Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 May 2014 11:07:27 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 May 2014 11:07:45 +0000 (13:07 +0200)
* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

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

Simple merge