[FFmpeg-cvslog] Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 11:47:35 2013 +0200| [d2c613dd1460a34ca166550d5d9d8cdd5cf278df] | committer: Michael Niedermayer

Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'

* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e':
  rtpproto: Support nonblocking reads

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

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