* commit '66028b7b':
  udp: Use AVOptions

Conflicts:
	libavformat/udp.c

See: aefed6caMerged-by: Michael Niedermayer <michaelni@gmx.at>