diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:18:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:18:52 +0100 |
| commit | 6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8 (patch) | |
| tree | da3e51458283183402484308d9f89e6399c454a5 /libavformat/http.c | |
| parent | 51268aaed245f6cc7252e5e3692e00e13963d601 (diff) | |
| parent | 76267ecc82e3018e1913a2483d5fc47d0949cbd8 (diff) | |
| download | ffmpeg-6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8.tar.gz | |
Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'
* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
http: Remove an unrelated and mistakenly set AVOption unit name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 12b7bdeff3..53e7b1ba0f 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -103,7 +103,7 @@ static const AVOption options[] = { {"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" }, -{"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E, "auth_type" }, +{"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E }, {NULL} }; #define HTTP_CLASS(flavor)\ |