]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup

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

Simple merge