diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:02:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:02:48 +0200 |
| commit | 016cca45047483f508c05aa10d9448f6fcb6de0a (patch) | |
| tree | 0fb2be1ebaa66f80227fcf78d2346f30268ca6aa | |
| parent | bc15b5238f9984458b5cceb99670e9db53fc74f1 (diff) | |
| parent | 7bdd2ff6825951f7a6a6008303acfce7c2a63532 (diff) | |
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>
| -rw-r--r-- | libavformat/http.c | 2 | ||||
| -rw-r--r-- | libavformat/http.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 2bac935e8c..567ce80021 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -658,7 +658,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, { HTTPContext *s = h->priv_data; int post, err; - char headers[4096] = ""; + char headers[HTTP_HEADERS_SIZE] = ""; char *authstr = NULL, *proxyauthstr = NULL; int64_t off = s->off; int len = 0; diff --git a/libavformat/http.h b/libavformat/http.h index a19ad8ed3e..be8ae7f460 100644 --- a/libavformat/http.h +++ b/libavformat/http.h @@ -24,6 +24,8 @@ #include "url.h" +#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 |