Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 08:52:48 +0000 (10:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 09:02:02 +0000 (11:02 +0200)
commit54ddbb477b786be1b90f54bc9aab36cd5babdf7d
tree6396225eedd6179882e50cd4aa82d877eeb53da0
parent4d4f5911d3121133929da7b859755860f93684fd
parentf849a77e67959eb6a83eb59b784aeefdb98cb80a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  network: factor out connect-listening code

Conflicts:
libavformat/network.h
libavformat/tcp.c

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