Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'

Browse Source

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

Conflicts:
	libavformat/udp.c

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

...

This commit is contained in:

Michael Niedermayer 2015-06-22 12:37:29 +02:00

parent 4e926fb969 61dc9d647c

commit 8fb672b50a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available