[FFmpeg-cvslog] Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 03:39:39 2014 +0200| [b4d4f8f8266e6407f21a62110905b27d3d3d71da] | committer: Michael Niedermayer

Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'

* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

See: c2a170ac0ddd53516d004cd2bf55ceaffa59642a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4d4f8f8266e6407f21a62110905b27d3d3d71da
---