http: Reduce scope of a variable in parse_content_encoding()
authorDiego Biurrun <diego@biurrun.de>
Wed, 13 Aug 2014 19:33:27 +0000 (21:33 +0200)
committerDiego Biurrun <diego@biurrun.de>
Fri, 15 Aug 2014 07:37:38 +0000 (09:37 +0200)
Also fixes an unused variable warning with zlib disabled.

libavformat/http.c

index 377d30e784cb834b6bf1f2cd85664322b3061bd9..e970786312ff2961a5e53a03ef8152ec66fcf46d 100644 (file)
@@ -384,11 +384,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) {