Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 19:20:37 +0000 (21:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 19:21:07 +0000 (21:21 +0200)
commitf0b99112e3570e10409cdc35e86dd431fad1546b
tree91e132bc756f2400266b5c07ff79a70d96b38a49
parent5c4160809698bf3731812d22ca8bf6c3754ff189
parentd4d90504a687d2c0ef77ccf11d831f24dcff9cf1
Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'

* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
  tls_gnutls: Add missing includes for the gcrypt thread safety callbacks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/tls_gnutls.c