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)
commit1a01f367a40f8df03282f66dc77e63f7fa8491f5
tree1d0eb6f78f21d1228fa26ec5a6200ce16eae527b
parentab06436dbff52efb8b46f857b0412f987ea83370
parent2427ac6ccd868811d1fe9df7c64c50ca58abe6f6
Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'

* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
  rtpproto: Update the parameter documentation

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