[FFmpeg-cvslog] Merge commit 'e58c85b0686892960042232e51c77168b264838a'
Michael Niedermayer
git at videolan.org
Wed Mar 12 03:38:06 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 03:28:43 2014 +0100| [c03af3ac1c4c865fdde5f57df6c2ccc646680f77] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c03af3ac1c4c865fdde5f57df6c2ccc646680f77
---
More information about the ffmpeg-cvslog
mailing list