* commit '2dc26561':
  lavf: group dump functions together

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