Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Oct 2014 10:28:00 +0000 (12:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Oct 2014 10:28:52 +0000 (12:28 +0200)
* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
  rtsp: Check a memory allocation

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

Trivial merge