Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 May 2015 20:37:05 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 May 2015 20:37:23 +0000 (22:37 +0200)
* 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>

Trivial merge