* commit '6c145ecf':
  twinvq: K&R formatting cosmetics

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