Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jun 2015 10:34:00 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Jun 2015 10:34:05 +0000 (12:34 +0200)
* cigaes/master:
  lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
  lavf/http: Indent else-clause.
  lavf/http: Properly process HTTP header on listen.
  lavf/http: Rudimentary error handling for HTTP requests received from clients.
  lavf/http: Process HTTP header before sending response.
  lavf/http: Document method option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge