OSDN Git Service

Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:17:49 +0000 (00:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:17:49 +0000 (00:17 +0200)
commit5dee3e8bb45d5f80f23a588a27e5d99caaa8f021
treedd227f2db4fce5285df0c5bb26262bf6ad525838
parent005200887b2c9df2e489bd6419697a6841dba396
parenteb8b05a3824a9fa85e20d603595ac8a3b83505d4
Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'

* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
  http: Add an option for forcing basic authentication

Conflicts:
libavformat/http.c
libavformat/version.h

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