* commit 'abe5268c':
  tcp: Use a different log message and level if there's more addresses to try

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