* commit '61dc9d647c6664e11674d9a10fdde29987d6acda': udp: Fix local_port management Conflicts: libavformat/udp.c See: 4f3f5ee1ac Merged-by: Michael Niedermayer <michaelni@gmx.at>
4f3f5ee1ac