Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 00:50:19 +0000 (02:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 00:51:35 +0000 (02:51 +0200)
commite621e6cac6dd99e069be9de694c2f9d33357a27d
tree252dbe4dc384fdaa25e1a27b2174f68d2e64ff7e
parentdac096cf39d24735f1992b7d867519f17974865b
parent28df1d24112c6ad0763985df2faeeb198cfbad69
Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'

* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
  http: Provide an option to override the HTTP method

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c