Changeset eff2ed2f in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2b388e6d

Parents:

a9f1d584 (diff), 57cde2b1 (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:37:05)

git-committer:

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

Message:

Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'

• commit '57cde2b180fcec0eaf60aad65f436ab6420546f5': lavf: move TLS-related ifdeffery to library specific files

Conflicts:

libavformat/network.c
libavformat/tls.h
libavformat/tls_openssl.c

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

(No files)