* commit '93d216d3':
  dict: K&R formatting cosmetics

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