* commit '14ddbb47':
  cavs: K&R formatting cosmetics

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