Merge commit 'e58c85b0686892960042232e51c77168b264838a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 02:28:43 +0000 (03:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 02:33:14 +0000 (03:33 +0100)
commitc03af3ac1c4c865fdde5f57df6c2ccc646680f77
tree5dd93a4ff5e1dbd5a7540f87f4dd62f6fd700fab
parentca2369cdee0d75708626d539e9eb8eb7e6f9cce3
parente58c85b0686892960042232e51c77168b264838a
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>
doc/protocols.texi
libavformat/http.c