[FFmpeg-cvslog] Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 17:53:01 2013 +0200| [89efaabc9949dcdc49126881beaa38355b8f9a44] | committer: Michael Niedermayer

Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'

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

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89efaabc9949dcdc49126881beaa38355b8f9a44
---