Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:58:13 +0000 (11:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:58:17 +0000 (11:58 +0200)
commitd6b37de4d42d7bcb1173f6e5c488a02af9470568
tree9b1fff4984be2089902a2e76465712b15ec9f3bb
parentb39f012dee7aac577b43c51a7119955e7509a72b
parent892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec
Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpproto.c