[FFmpeg-cvslog] Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 21:20:37 2015 +0200| [f0b99112e3570e10409cdc35e86dd431fad1546b] | committer: Michael Niedermayer

Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0b99112e3570e10409cdc35e86dd431fad1546b
---