Merge commit '9835abb6d63fb07613994ae90e72fef758149408'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:56:56 +0000 (11:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:56:56 +0000 (11:56 +0200)
commit82070b01b85f200ec1a76064159f82626c167c12
tree0c7b43a067e268ebfd3207281b0ecc47816888d8
parent606e8baf0fec23140f2a1baffb8752cb761039f5
parent9835abb6d63fb07613994ae90e72fef758149408
Merge commit '9835abb6d63fb07613994ae90e72fef758149408'

* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

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

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