[FFmpeg-cvslog] Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 12:30:35 2013 +0200| [1a01f367a40f8df03282f66dc77e63f7fa8491f5] | committer: Michael Niedermayer

Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a01f367a40f8df03282f66dc77e63f7fa8491f5
---