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)
* commit '3357bccc5cb31795f248cd72dc480025f3075a5b':
  udp: Allow specifying multicast include/blocks as host names as well

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

Simple merge