diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:31:08 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 11:31:17 +0200 |
commit | 15ca3ab82531e907c810674fc2c79e5e0b522c74 (patch) | |
tree | fcb7ced9de8b9c9aff1b51971b4775c7c348b4f8 /ffmpeg.c | |
parent | c7d17179571daa875083e2fe72c498ae47772d75 (diff) | |
parent | 3357bccc5cb31795f248cd72dc480025f3075a5b (diff) | |
download | ffmpeg-15ca3ab82531e907c810674fc2c79e5e0b522c74.tar.gz |
Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'
* commit '3357bccc5cb31795f248cd72dc480025f3075a5b':
udp: Allow specifying multicast include/blocks as host names as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions