[FFmpeg-cvslog] Merge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2
Michael Niedermayer
git at videolan.org
Sun Mar 16 03:56:28 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:37:53 2014 +0100| [bcc6429c01a8d244ee0f45f045ab00edf6391b7e] | committer: Michael Niedermayer
Merge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2
* commit '40de74d0eb8c1898e2184a1484fe246aed5b295d':
http: Export Content-Type information
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcc6429c01a8d244ee0f45f045ab00edf6391b7e
---
More information about the ffmpeg-cvslog
mailing list