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)
commit293a8e426fc05db44ac8952a1f62b254e9362f3f
tree3297fd65a9edb33e2313612d88c18943bd4df7ff
parent392b4b663c450f5522f7c1442da91f7647db6bf0
parent460b509a34fb5fad3bedac8429f53594d3923ea8
Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
  rtsp: Check a memory allocation

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