[FFmpeg-cvslog] Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 10 01:27:10 2012 +0100| [78ac7ee97040a2e9a69b81f82a89edd779e124bb] | committer: Michael Niedermayer

Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'

* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
	libavcodec/h264.c

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

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