Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:39:39 +0000 (03:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:44:11 +0000 (03:44 +0200)
* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

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

Simple merge