diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 10:52:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-02 11:02:02 +0200 |
| commit | 54ddbb477b786be1b90f54bc9aab36cd5babdf7d (patch) | |
| tree | 6396225eedd6179882e50cd4aa82d877eeb53da0 /tests | |
| parent | 4d4f5911d3121133929da7b859755860f93684fd (diff) | |
| parent | f849a77e67959eb6a83eb59b784aeefdb98cb80a (diff) | |
| download | ffmpeg-54ddbb477b786be1b90f54bc9aab36cd5babdf7d.tar.gz | |
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>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions