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)
* commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec':
  rtpproto: Simplify the rtp_read function by looping over the fds

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

Simple merge