[FFmpeg-cvslog] Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 15 12:11:55 2014 +0200| [1e81b185ae722b5ba93a8615615241a07b3b28ee] | committer: Michael Niedermayer

Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e81b185ae722b5ba93a8615615241a07b3b28ee
---