[FFmpeg-cvslog] Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  1 12:02:33 2013 +0200| [fcccb4c11dcfcbdbb4b0d6eed5ed276d946c7d13] | committer: Michael Niedermayer

Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'

* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
  rtpproto: Move rtpproto specific function declarations to a separate header

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

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