diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:11:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:12:35 +0200 |
| commit | 1e81b185ae722b5ba93a8615615241a07b3b28ee (patch) | |
| tree | 9b5a6f5b7312ba29b0812766eb8fa1008da270b0 | |
| parent | d3a22491c736588ee1e94a240bbe9e35bbb8d88a (diff) | |
| parent | 7ccb847f0f1f28199fa254847b91b6e50fb92832 (diff) | |
| download | ffmpeg-1e81b185ae722b5ba93a8615615241a07b3b28ee.tar.gz | |
Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'
* commit '7ccb847f0f1f28199fa254847b91b6e50fb92832':
http: Reduce scope of a variable in parse_content_encoding()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index c0c2739c28..09b0d6ec07 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -390,11 +390,11 @@ static void parse_content_range(URLContext *h, const char *p) static int parse_content_encoding(URLContext *h, const char *p) { - HTTPContext *s = h->priv_data; - if (!av_strncasecmp(p, "gzip", 4) || !av_strncasecmp(p, "deflate", 7)) { #if CONFIG_ZLIB + HTTPContext *s = h->priv_data; + s->compressed = 1; inflateEnd(&s->inflate_stream); if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) { |