diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:44:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:45:16 +0100 |
| commit | f36da16ede525fb4925ad3ec863f131bc6743540 (patch) | |
| tree | 460f987b290457bebc9bba558bf2b1777609f656 /libavformat/r3d.c | |
| parent | c03af3ac1c4c865fdde5f57df6c2ccc646680f77 (diff) | |
| parent | ddfc98906373d1f17f6205cedd14c68d7a75995f (diff) | |
| download | ffmpeg-f36da16ede525fb4925ad3ec863f131bc6743540.tar.gz | |
Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'
* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
http: Support setting custom User-Agent
Conflicts:
doc/protocols.texi
libavformat/http.c
See: 2bb1c713cc7e8fd018a3a0b579145a31a1c47bce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/r3d.c')
0 files changed, 0 insertions, 0 deletions