* commit '7f93a861':
  mpeg12enc: K&R formatting cosmetics

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