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)
* commit '389380c27915b0505fed538cd54c035c891fabd9':
  http: Do move the class instantiation in the conditional block

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

Simple merge