Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:42:38 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:42:43 +0000 (11:42 +0200)
commit4b8b3efb1e40ba028c31a0e8747867f9240cc755
tree548cc34d6ff952611108ac4210716600acf2636b
parent42a6a3841868b2150b7a13f35458bd9d2ffeb3e6
parente9e86d9ef637f5a600c76b352ffe5a82b71b25d1
Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'

* commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1':
  rtmpdh: Create sufficiently long private keys for gcrypt/nettle

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