Changeset 48e02e25 in ffmpeg

Timestamp:

May 29, 2015, 9:38:37 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

42a6a384

Parents:

fbeb3fa9 (diff), 063f746 (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:38:26)

git-committer:

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

Message:

Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'

• commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53': rtmpdh: Add fate test for the DH handshake routine

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

(No files)