[FFmpeg-cvslog] Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 13:24:53 2013 +0200| [2ee58af53e1cb788f9b8d50530ec1f5f73c431b6] | committer: Michael Niedermayer

Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'

* commit '1851e1d05d06f6ef3436c667e4354da0f407b226':
  rtpproto: Check the size before reading buf[1]

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

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