* commit 'd234c7a0':
  mpeg4videodec: K&R formatting cosmetics

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