* commit '3407172b':
  avienc: K&R formatting cosmetics

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