]> git.sesse.net Git - ffmpeg/commit - libavutil/tests/cpu.c
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)
commitfb4a12cda4033f2f3d3d1039739f6e0e6f9afb82
treedfb334904d5d00d62e808a30827843695a2c3a05
parent697984b9db4d4d199680f43ac3eb662cd1d37eff
parente368b0cbfa3fdc627c331e34556f8e39296d04d5
Merge commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5'

* commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5':
  tls_mbedtls: Use non-deprecated header file

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