Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 10:37:29 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 10:37:29 +0000 (12:37 +0200)
* commit '61dc9d647c6664e11674d9a10fdde29987d6acda':
  udp: Fix local_port management

Conflicts:
libavformat/udp.c

See: 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge