Commit 016cca45 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7bdd2ff6'

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

Conflicts:
	libavformat/http.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bc15b523 7bdd2ff6
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment