[FFmpeg-cvslog] Merge commit 'e122b12c88487ac8766ff4eb071856b0666f0134'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr  6 23:36:16 2017 -0300| [8489d1427490f73c496158eeb4bf82ee5005095f] | committer: James Almer

Merge commit 'e122b12c88487ac8766ff4eb071856b0666f0134'

* commit 'e122b12c88487ac8766ff4eb071856b0666f0134':
  build: Drop gcrypt support

This commit is a noop. GCrypt support is exposed in configure as a
command line option, and it's independent of GnuTLS.

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

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