diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:38:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:38:07 +0100 |
| commit | 6a10263f163af66f9e143cb0ba206cb99e78e605 (patch) | |
| tree | c4fcd34ea36f51fc1843d70789ff9e48f5d4ea69 /libavformat/data_uri.c | |
| parent | bcc6429c01a8d244ee0f45f045ab00edf6391b7e (diff) | |
| parent | 09dca5106698871920328ae8041d1437ce3cff43 (diff) | |
| download | ffmpeg-6a10263f163af66f9e143cb0ba206cb99e78e605.tar.gz | |
Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2
* commit '09dca5106698871920328ae8041d1437ce3cff43':
http: Support setting custom User-Agent
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/data_uri.c')
0 files changed, 0 insertions, 0 deletions