Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'

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

Conflicts:
	libavformat/http.c

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

diff --cc libavformat/http.c
Simple merge

diff --cc libavformat/http.h
index a19ad8ed3e246b9000671f60eabcbd44f3601a48,3d301a715fe62962baf9336b637205135abe95ad..be8ae7f46015f061fda6281ab0b55e9eecb1115f
--- 1/libavformat/http.h
--- 2/libavformat/http.h
+++ b/libavformat/http.h
@@@ -24,6 -24,8 +24,8 @@@
  
  #include "url.h"
  
 -#define HTTP_HEADERS_SIZE 1024
++#define HTTP_HEADERS_SIZE 4096
+ 
  /**
   * Initialize the authentication state based on another HTTP URLContext.
   * This can be used to pre-initialize the authentication parameters if