Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)
commit78ac7ee97040a2e9a69b81f82a89edd779e124bb
treebae6d10aa246d91b094bf2754efcb944049c7c46
parent5c75708cf08d57ed4f9744201554d276c8d5c2e9
parent5d471b73d20616f5ac701ff62e5de49465cda264
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@gmx.at>
libavcodec/flvdec.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/vc1dec.c
libavformat/rtpdec.c