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)
commitd2c613dd1460a34ca166550d5d9d8cdd5cf278df
tree905ae19fbbe79b69367b68e8e351232f17d47041
parent57b8ce414be574a772d386f57afa502eac072085
parent54e03ff6af8a070f1055edd26028f3f7b2e2ca8e
Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'

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

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