* commit '1d4579e3':
  tcp: Add AVOption support

Conflicts:
	libavformat/tcp.c

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