aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSteven Liu <lingjiujianke@gmail.com>2016-09-16 10:42:34 +0800
committerClément Bœsch <u@pkh.me>2016-09-17 13:48:34 +0200
commit27714b462d1bff9e9b40fbdabb39f58e79032b81 (patch)
tree730b9c38fe0b4654c47a0dc01786fbf099c8d5b1 /doc
parent44bcb636c1a7052059330c3edbd900246e15ae60 (diff)
downloadffmpeg-27714b462d1bff9e9b40fbdabb39f58e79032b81.tar.gz
lavf/http: deprecate user-agent option
Diffstat (limited to 'doc')
-rw-r--r--doc/protocols.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 470c99ceb4..3abc5f38d4 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -291,11 +291,13 @@ Use persistent connections if set to 1, default is 0.
@item post_data
Set custom HTTP post data.
-@item user-agent
@item user_agent
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 timeout
Set timeout in microseconds of socket I/O operations used by the underlying low level
operation. By default it is set to -1, which means that the timeout is