Changeset dd940093 in ffmpeg

Timestamp:

Jun 14, 2015, 11:30:55 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5ef578d0

Parents:

ec5164aa (diff), 74ea116 (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> (06/14/15 23:30:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/14/15 23:30:55)

Message:

Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

• commit '74ea1167d91ccb2e1f2943efa030f2c278b598be': tls_gnutls: fix hang on disconnection

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

(No files)