Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:53:14 +0000 (04:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 03:53:54 +0000 (04:53 +0100)
commitcd25412f598404e2af9e70038cfc01f344ba043b
treeff89428dfb48b614dc61e087e92f69d106ae2666
parent0d487654ea8515d916f5d3b9e208fe39d9723fc5
parent2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
libavformat/http.c

See: c01d1d4ddf4d8240427341af1c077f6455243576
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/protocols.texi
libavformat/http.c