mirror of https://git.ffmpeg.org/ffmpeg.git
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: a9f1d584e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
eff2ed2fde