[FFmpeg-cvslog] Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 27 08:58:20 2013 +0200| [5cb3d35dcc239d319229dc453f3acc4486d26577] | committer: Michael Niedermayer

Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'

* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
  rtpenc: Fix some odd comments

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

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