diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
commit | 59bf303d6806e1ab0fa415f5313131c9ca7aedb7 (patch) | |
tree | 10a2e9e17a6d4a0e499e8236da4acf49d95445aa /libavformat/http.c | |
parent | 7dfd58ef495f2724cca40cd4a59b1d0c4d81aa28 (diff) | |
parent | c4549bd66a94bec1284dcca0da19e5038a82cbe3 (diff) | |
download | ffmpeg-59bf303d6806e1ab0fa415f5313131c9ca7aedb7.tar.gz |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
Chronomaster DFA decoder
DUPLICATE: framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
http: header field names are case insensitive
Conflicts:
LICENSE
README
doc/indevs.texi
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
-rw-r--r-- | libavformat/http.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index b3499d143a..8c5b9431e6 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -246,12 +246,12 @@ static int process_line(URLContext *h, char *line, int line_count, p++; while (isspace(*p)) p++; - if (!strcmp(tag, "Location")) { + if (!strcasecmp(tag, "Location")) { strcpy(s->location, p); *new_location = 1; - } else if (!strcmp (tag, "Content-Length") && s->filesize == -1) { + } else if (!strcasecmp (tag, "Content-Length") && s->filesize == -1) { s->filesize = atoll(p); - } else if (!strcmp (tag, "Content-Range")) { + } else if (!strcasecmp (tag, "Content-Range")) { /* "bytes $from-$to/$document_size" */ const char *slash; if (!strncmp (p, "bytes ", 6)) { @@ -261,14 +261,14 @@ static int process_line(URLContext *h, char *line, int line_count, s->filesize = atoll(slash+1); } h->is_streamed = 0; /* we _can_ in fact seek */ - } else if (!strcmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) { + } else if (!strcasecmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) { s->filesize = -1; s->chunksize = 0; - } else if (!strcmp (tag, "WWW-Authenticate")) { + } else if (!strcasecmp (tag, "WWW-Authenticate")) { ff_http_auth_handle_header(&s->auth_state, tag, p); - } else if (!strcmp (tag, "Authentication-Info")) { + } else if (!strcasecmp (tag, "Authentication-Info")) { ff_http_auth_handle_header(&s->auth_state, tag, p); - } else if (!strcmp (tag, "Connection")) { + } else if (!strcasecmp (tag, "Connection")) { if (!strcmp(p, "close")) s->willclose = 1; } |