Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:40:05 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:40:05 +0000 (11:40 +0200)
commit42f7c45d7b856839fa613c22645d5bff5352fc87
tree41afdc71546c3d5b52d06df062fb58f59056b3fe
parent15ca3ab82531e907c810674fc2c79e5e0b522c74
parent7d99c92945e4b2d12ed2126365482e1900340da0
Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'

* commit '7d99c92945e4b2d12ed2126365482e1900340da0':
  udp: Keep track of include and exclude sources separately

Conflicts:
libavformat/udp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/udp.c