* commit 'fcae3ff1':
  dsicinav: K&R formatting cosmetics

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