generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2

Browse Source 
* commit '09dca5106698871920328ae8041d1437ce3cff43':
  http: Support setting custom User-Agent

Conflicts:
	doc/protocols.texi
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-16 03:38:07 +01:00
parent bcc6429c01 09dca51066
commit 6a10263f16
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/protocols.texi
View File

@@ -233,8 +233,9 @@ value must be a string encoding the headers.
Force a content type.
@item user-agent
Override User-Agent header. If not specified the protocol will use a
string describing the libavformat build.
@item user_agent
Override the User-Agent header. If not specified the protocol will use a
string describing the libavformat build. ("Lavf/<version>")
@item multiple_requests
Use persistent connections if set to 1. By default it is 0.