[SCM] libav/experimental: http: Reduce scope of a variable in parse_content_encoding()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7ccb847f0f1f28199fa254847b91b6e50fb92832
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Aug 13 21:33:27 2014 +0200

    http: Reduce scope of a variable in parse_content_encoding()
    
    Also fixes an unused variable warning with zlib disabled.

diff --git a/libavformat/http.c b/libavformat/http.c
index 377d30e..e970786 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -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) {

-- 
Libav/FFmpeg packaging