diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-06 14:11:56 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:09 -0300 |
| commit | dc8e15ef15d060a9ca118905c770710ce43a0723 (patch) | |
| tree | 78fa0e528fd145ef73fc5fb89a27a3d68fb2544b | |
| parent | 11cb635c84cd5d011abc2aade27c7498bcf29595 (diff) | |
avformat/http: Remove deprecated "user-agent" option
Deprecated in 27714b462d1bff9e9b40fbdabb39f58e79032b81.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | doc/protocols.texi | 3 | ||||
| -rw-r--r-- | libavformat/http.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index a6e46b99ad..2cc2b561de 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -406,9 +406,6 @@ Set the Referer header. Include 'Referer: URL' header in HTTP request. Override the User-Agent header. If not specified the protocol will use a string describing the libavformat build. ("Lavf/<version>") -@item user-agent -This is a deprecated option, you can use user_agent instead it. - @item reconnect_at_eof If set then eof is treated like an error and causes reconnection, this is useful for live / endless streams. diff --git a/libavformat/http.c b/libavformat/http.c index fb2d9306bd..1fc95c768c 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -141,9 +141,6 @@ static const AVOption options[] = { { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "referer", "override referer header", OFFSET(referer), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, -#if FF_API_HTTP_USER_AGENT - { "user-agent", "use the \"user_agent\" option instead", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D|AV_OPT_FLAG_DEPRECATED }, -#endif { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D | E }, { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, diff --git a/libavformat/version.h b/libavformat/version.h index 1f130af3f8..032f1a3457 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HTTP_USER_AGENT -#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_HLS_WRAP #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) #endif |