* commit '5c53bf7a':
  http: Pass options through to the nested protocol

Conflicts:
	libavformat/http.c

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