diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 06:28:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 06:33:14 +0400 |
| commit | c03af3ac1c4c865fdde5f57df6c2ccc646680f77 (patch) | |
| tree | 5dd93a4ff5e1dbd5a7540f87f4dd62f6fd700fab /doc | |
| parent | ca2369cdee0d75708626d539e9eb8eb7e6f9cce3 (diff) | |
| parent | e58c85b0686892960042232e51c77168b264838a (diff) | |
Merge commit 'e58c85b0686892960042232e51c77168b264838a'
* commit 'e58c85b0686892960042232e51c77168b264838a':
http: Export Content-Type information
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 76d851b65619e5a0fe4cc5248a6858287fe890b4
See: 20899c54f03c413b225e8839a3c5318ab47abe55
See: 255ec768da6f6e821775888621da2156764598da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 5f6b118dc6..ee9e01193c 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -248,7 +248,7 @@ operation. By default it is set to -1, which means that the timeout is not specified. @item mime_type -Set MIME type. +Export the MIME type. @item icy If set to 1 request ICY (SHOUTcast) metadata from the server. If the server |