* qatar/master:
  aac: K&R formatting cosmetics

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