[FFmpeg-cvslog] Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 11:58:13 2013 +0200| [d6b37de4d42d7bcb1173f6e5c488a02af9470568] | committer: Michael Niedermayer

Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'

* commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec':
  rtpproto: Simplify the rtp_read function by looping over the fds

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

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