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

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