diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 12:37:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 12:37:29 +0200 |
| commit | 8fb672b50ae3c5faf75889a2ed8a867af0ddc8a8 (patch) | |
| tree | 3c5d53ef58d42b7161d9c2f1dd27626e6b6e565b /libavformat/url.h | |
| parent | 4e926fb969acbb27415c2109d7339259875b6909 (diff) | |
| parent | 61dc9d647c6664e11674d9a10fdde29987d6acda (diff) | |
Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'
* commit '61dc9d647c6664e11674d9a10fdde29987d6acda':
udp: Fix local_port management
Conflicts:
libavformat/udp.c
See: 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/url.h')
0 files changed, 0 insertions, 0 deletions