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)
commitb4d4f8f8266e6407f21a62110905b27d3d3d71da
tree2e6a76ed3dcc4b938923ec64098ef67b766c42c5
parentc2a170ac0ddd53516d004cd2bf55ceaffa59642a
parent6a463e7fb4f028c52d2e2d054f9483f4fff492bc
Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'

* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

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