Michael Niedermayer 42f7c45d7b 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>

2013-07-30 11:40:05 +02:00

30 KiB

Raw Blame History

View Raw