virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'

Browse Source 
* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
  http: Provide an option to override the HTTP method

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-22 02:50:19 +02:00
commit e621e6cac6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/http.c
View File

@ -89,6 +89,7 @@ typedef struct {
#endif
AVDictionary *chained_options;
int send_expect_100;
char *method;
} HTTPContext;
#define OFFSET(x) offsetof(HTTPContext, x)
@ -116,6 +117,7 @@ static const AVOption options[] = {
{"location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
{"offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D },
{"end_offset", "try to limit the request to bytes preceding this offset", OFFSET(end_off), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D },
{"method", "Override the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E, },
{NULL}
};
#define HTTP_CLASS(flavor)\
@ -684,7 +686,11 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
s->chunked_post = 0;
}
method = post ? "POST" : "GET";
if (s->method)
method = s->method;
else
method = post ? "POST" : "GET";
authstr = ff_http_auth_create_response(&s->auth_state, auth, local_path,
method);
proxyauthstr = ff_http_auth_create_response(&s->proxy_auth_state, proxyauth,