[FFmpeg-cvslog] Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 13 12:18:00 2012 +0100| [2e5e2bf935ae91b3113f480086c0652f17935b0c] | committer: Michael Niedermayer

Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'

* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

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

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