[FFmpeg-cvslog] Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 11:53:49 2013 +0200| [b39f012dee7aac577b43c51a7119955e7509a72b] | committer: Michael Niedermayer

Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'

* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6':
  rtpproto: Remove a misplaced comment

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

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