[FFmpeg-cvslog] Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 14 00:17:49 2013 +0200| [5dee3e8bb45d5f80f23a588a27e5d99caaa8f021] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dee3e8bb45d5f80f23a588a27e5d99caaa8f021
---