[FFmpeg-cvslog] Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 12 13:00:42 2013 +0100| [dda2d2974863cb862f63fc1927d1d9ad5733555b] | committer: Michael Niedermayer

Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'

* commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup

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

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