* commit '7bdd2ff6':
  http: Use a constant for the supported header size

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