* commit '711aa2a8':
  lavf: dump stream side data when probing

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