From: James Almer Date: Fri, 7 Apr 2017 02:36:16 +0000 (-0300) Subject: Merge commit 'e122b12c88487ac8766ff4eb071856b0666f0134' X-Git-Tag: n3.4~2136 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=8489d1427490f73c496158eeb4bf82ee5005095f 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 --- 8489d1427490f73c496158eeb4bf82ee5005095f