Changeset 4b8b3efb in ffmpeg

Timestamp:

May 29, 2015, 9:42:43 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e1b00195

Parents:

42a6a384 (diff), e9e86d9e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/29/15 09:42:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/29/15 09:42:43)

Message:

Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'

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

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

(No files)