diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:17:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 00:17:49 +0200 |
| commit | 5dee3e8bb45d5f80f23a588a27e5d99caaa8f021 (patch) | |
| tree | dd227f2db4fce5285df0c5bb26262bf6ad525838 /libavformat/wtv.h | |
| parent | 005200887b2c9df2e489bd6419697a6841dba396 (diff) | |
| parent | eb8b05a3824a9fa85e20d603595ac8a3b83505d4 (diff) | |
| download | ffmpeg-5dee3e8bb45d5f80f23a588a27e5d99caaa8f021.tar.gz | |
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>
Diffstat (limited to 'libavformat/wtv.h')
0 files changed, 0 insertions, 0 deletions