[FFmpeg-cvslog] Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:31:08 2013 +0200| [15ca3ab82531e907c810674fc2c79e5e0b522c74] | committer: Michael Niedermayer

Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15ca3ab82531e907c810674fc2c79e5e0b522c74
---