* commit 'c1401054':
  oma: K&R formatting cosmetics

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