diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:28:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:33:14 +0100 |
| commit | c03af3ac1c4c865fdde5f57df6c2ccc646680f77 (patch) | |
| tree | 5dd93a4ff5e1dbd5a7540f87f4dd62f6fd700fab /tools | |
| parent | ca2369cdee0d75708626d539e9eb8eb7e6f9cce3 (diff) | |
| parent | e58c85b0686892960042232e51c77168b264838a (diff) | |
| download | ffmpeg-c03af3ac1c4c865fdde5f57df6c2ccc646680f77.tar.gz | |
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 'tools')
0 files changed, 0 insertions, 0 deletions