Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)
commit6b1b63df85ffa020bb36ac8d444a83b755a1d86d
tree232b69289597b1021be4547208b9e3e48ad6b45b
parent5dee3e8bb45d5f80f23a588a27e5d99caaa8f021
parent71549a857b13edf4c4f95037de6ed5bb4c4bd4af
Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'

* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
  http: Support auth method detection for POST

Conflicts:
libavformat/version.h

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