diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-27 22:37:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-27 22:37:23 +0200 |
| commit | eff2ed2fde8d6741e7a5218e036998846062c846 (patch) | |
| tree | 894d369cab04efe2e40db0fc67f98d08699aaf93 | |
| parent | a9f1d584e53fb39d983201585cb136986a85cac8 (diff) | |
| parent | 57cde2b180fcec0eaf60aad65f436ab6420546f5 (diff) | |
| download | ffmpeg-eff2ed2fde8d6741e7a5218e036998846062c846.tar.gz | |
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>
0 files changed, 0 insertions, 0 deletions