Merge commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:33:55 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 01:37:17 +0000 (02:37 +0100)
commite7521d9771eac5ba07558b2b2dba1155e57b9670
tree51cf8fbfcb9c4b527d612989c527f8bdaedb3163
parentdd4de4a987f33cb33c9f4aae59e70522ed0982e2
parent9f810a9b374e0ff8e2a19fd8a7347afe2933e229
Merge commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229'

* commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229':
  libavformat: Check for malloc failures in avformat_new_stream

See: a66893ac949864352b36b39e48c4cd72bbd81e54
Merged-by: Michael Niedermayer <michaelni@gmx.at>