Commit 8fb672b5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '61dc9d64'

* commit '61dc9d64':
  udp: Fix local_port management

Conflicts:
	libavformat/udp.c

See: 4f3f5ee1Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4e926fb9 61dc9d64
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment