Merge commit '389380c27915b0505fed538cd54c035c891fabd9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 00:59:46 +0000 (02:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 01:00:06 +0000 (03:00 +0200)
commitab7c67905d1a97c274b24e268798d2f5fa2f6220
tree9652ecc5ed4ab43b887faf7ea1ddce2f35af7ca7
parente621e6cac6dd99e069be9de694c2f9d33357a27d
parent389380c27915b0505fed538cd54c035c891fabd9
Merge commit '389380c27915b0505fed538cd54c035c891fabd9'

* commit '389380c27915b0505fed538cd54c035c891fabd9':
  http: Do move the class instantiation in the conditional block

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