Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:31:08 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:31:17 +0000 (11:31 +0200)
commit15ca3ab82531e907c810674fc2c79e5e0b522c74
treefcb7ced9de8b9c9aff1b51971b4775c7c348b4f8
parentc7d17179571daa875083e2fe72c498ae47772d75
parent3357bccc5cb31795f248cd72dc480025f3075a5b
Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'

* commit '3357bccc5cb31795f248cd72dc480025f3075a5b':
  udp: Allow specifying multicast include/blocks as host names as well

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