diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:17:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:17:49 +0200 |
| commit | 5dee3e8bb45d5f80f23a588a27e5d99caaa8f021 (patch) | |
| tree | dd227f2db4fce5285df0c5bb26262bf6ad525838 /libavformat/http.c | |
| parent | 005200887b2c9df2e489bd6419697a6841dba396 (diff) | |
| parent | eb8b05a3824a9fa85e20d603595ac8a3b83505d4 (diff) | |
Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
http: Add an option for forcing basic authentication
Conflicts:
libavformat/http.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 1b21e47c29..c14855023c 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -98,6 +98,9 @@ static const AVOption options[] = { {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, +{"auth_type", "HTTP authentication type", OFFSET(auth_state.auth_type), AV_OPT_TYPE_INT, {.i64 = HTTP_AUTH_NONE}, HTTP_AUTH_NONE, HTTP_AUTH_BASIC, D|E, "auth_type" }, +{"none", "No auth method set, autodetect", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_NONE}, 0, 0, D|E, "auth_type" }, +{"basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_BASIC}, 0, 0, D|E, "auth_type" }, {NULL} }; #define HTTP_CLASS(flavor)\ |