Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'

* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8': http: Remove an unrelated and mistakenly set AVOption unit name Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 6d648dcfc9
parent 51268aaed2 76267ecc82
commit 6d648dcfc9
1 changed files with 1 additions and 1 deletions
--- 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)\