* commit 'dc6ea00c':
  mpeg4video: K&R formatting cosmetics

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