Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:30:35 +0000 (12:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:30:40 +0000 (12:30 +0200)
* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
  rtpproto: Update the parameter documentation

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

Simple merge