Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:11:55 +0000 (12:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:12:35 +0000 (12:12 +0200)
commit1e81b185ae722b5ba93a8615615241a07b3b28ee
tree9b5a6f5b7312ba29b0812766eb8fa1008da270b0
parentd3a22491c736588ee1e94a240bbe9e35bbb8d88a
parent7ccb847f0f1f28199fa254847b91b6e50fb92832
Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c