* commit '50ecf157':
  avformat: utils: K&R formatting cosmetics

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