ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'

Browse Source 
* commit '7ccb847f0f1f28199fa254847b91b6e50fb92832':
  http: Reduce scope of a variable in parse_content_encoding()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-15 12:11:55 +02:00
commit 1e81b185ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/http.c
View File

@ -390,11 +390,11 @@ static void parse_content_range(URLContext *h, const char *p)
static int parse_content_encoding(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) || if (!av_strncasecmp(p, "gzip", 4) ||
!av_strncasecmp(p, "deflate", 7)) { !av_strncasecmp(p, "deflate", 7)) {
#if CONFIG_ZLIB #if CONFIG_ZLIB
HTTPContext *s = h->priv_data;
s->compressed = 1; s->compressed = 1;
inflateEnd(&s->inflate_stream); inflateEnd(&s->inflate_stream);
if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) { if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) {