[FFmpeg-cvslog] Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 16 12:28:00 2014 +0200| [293a8e426fc05db44ac8952a1f62b254e9362f3f] | committer: Michael Niedermayer

Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=293a8e426fc05db44ac8952a1f62b254e9362f3f
---