Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 15:53:01 +0000 (17:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 15:53:01 +0000 (17:53 +0200)
commit89efaabc9949dcdc49126881beaa38355b8f9a44
tree61bc2709d50bc13b2670323656d20bab79e6ee16
parent287f7d0ae1267bf5e505d4173f5a4cb77f433c66
parentabe5268c3328bf0e8fcfb7dc6e231b8920177c3a
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@gmx.at>
libavformat/network.c
libavformat/network.h
libavformat/tcp.c
libavformat/unix.c