Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:00:42 +0000 (13:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:00:50 +0000 (13:00 +0100)
commitdda2d2974863cb862f63fc1927d1d9ad5733555b
tree9fe4b2b848c98074c315a4cdac9bd9c31cf5bd5e
parent4a0d1b2159a804de6b91e34ba8e4c12bd76a2da7
parentc44784c9bb9d0ddf5d39d0dfa640816a57b8f457
Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtp.c