Changeset 9221e362 in ffmpeg

Timestamp:

May 22, 2015, 12:38:11 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a0124b89

Parents:

162644c (diff), d13b124e (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/22/15 00:37:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/22/15 00:38:11)

Message:

Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

• commit 'd13b124eaf452b267480074b2e6946538ed03a6e': tls: Remove the nonblocking code

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

(No files)