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

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>