diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 11:56:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 11:56:56 +0200 |
| commit | 82070b01b85f200ec1a76064159f82626c167c12 (patch) | |
| tree | 0c7b43a067e268ebfd3207281b0ecc47816888d8 /libswresample/libswresample.v | |
| parent | 606e8baf0fec23140f2a1baffb8752cb761039f5 (diff) | |
| parent | 9835abb6d63fb07613994ae90e72fef758149408 (diff) | |
| download | ffmpeg-82070b01b85f200ec1a76064159f82626c167c12.tar.gz | |
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>
Diffstat (limited to 'libswresample/libswresample.v')
0 files changed, 0 insertions, 0 deletions