Merge commit '57cde2b1'
* commit '57cde2b1': lavf: move TLS-related ifdeffery to library specific files Conflicts: libavformat/network.c libavformat/tls.h libavformat/tls_openssl.c See: a9f1d584Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment