Changeset fbf9583f in ffmpeg

Timestamp:

May 27, 2015, 8:17:17 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a9f1d584

Parents:

4a006b9e (diff), d8ffb205 (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/27/15 20:17:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/27/15 20:17:17)

Message:

Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'

• commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125': lavf: split tls.c

Conflicts:

libavformat/tls.c
libavformat/tls_gnutls.c
libavformat/tls_openssl.c

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

(No files)