Merge commit '4130e05ff496667565ff7c386a514bd46434eddf'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 20:44:28 +0000 (17:44 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 20:44:28 +0000 (17:44 -0300)
* commit '4130e05ff496667565ff7c386a514bd46434eddf':
  libavformat: add mbedTLS based TLS

This commit is a noop, see c24d247e2c2ccd13fda09fe4194bf2ff0eb42256

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge