Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Apr 2015 19:12:23 +0000 (21:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Apr 2015 19:12:47 +0000 (21:12 +0200)
* commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f':
  rtp: Add an option to set the send/receive buffer size

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

Simple merge