[FFmpeg-cvslog] Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 11:40:49 2013 +0200| [102397d2c14dcb58a032832b04fee2fabe2943b2] | committer: Michael Niedermayer

Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c

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

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