Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:47:35 +0000 (11:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 09:47:42 +0000 (11:47 +0200)
* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e':
  rtpproto: Support nonblocking reads

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

Simple merge