* commit 'cd874cf8':
  http: Allow setting a Content-Type for POST requests

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