Merge commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:51:22 +0000 (13:51 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:54:30 +0000 (13:54 -0300)
commit762c2b5dcd99a08452299cd1f83070f88115f1f3
tree5ef18e0c76d00e388389c6662e778349a2332b06
parent23ce57af3ad684363881cdd66d5724f40963a65c
parent9b4c3f5aadf54ffd2a6e15746b1fd736379883c4
Merge commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4'

* commit '9b4c3f5aadf54ffd2a6e15746b1fd736379883c4':
  network: Add RFC 8305 style "Happy Eyeballs"/"Fast Fallback" helper function

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