Merge commit '8c76bfacf663ff71cee5264a74d0f9c86addd325'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:54:59 +0000 (13:54 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:54:59 +0000 (13:54 -0300)
commitef71ef5f30ddf1cd61e46628a04608892caf76d2
treef2005c9c42aed6993bc5e7b17aeb00687b587286
parent762c2b5dcd99a08452299cd1f83070f88115f1f3
parent8c76bfacf663ff71cee5264a74d0f9c86addd325
Merge commit '8c76bfacf663ff71cee5264a74d0f9c86addd325'

* commit '8c76bfacf663ff71cee5264a74d0f9c86addd325':
  tcp: Use ff_connect_parallel for RFC 8305 style connecting

Merged-by: James Almer <jamrial@gmail.com>
libavformat/tcp.c