[FFmpeg-cvslog] Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:30:40 2015 +0100| [1da83d52bc0f67597a6007a017f7a8118e848b71] | committer: Michael Niedermayer

Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4

* commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc':
  rtsp: Check a memory allocation

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

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