]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:10:14 +0000 (19:10 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:10:14 +0000 (19:10 -0300)
* commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5':
  tls_mbedtls: Use non-deprecated header file

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

Simple merge