[FFmpeg-cvslog] Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 27 22:37:05 2015 +0200| [eff2ed2fde8d6741e7a5218e036998846062c846] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eff2ed2fde8d6741e7a5218e036998846062c846
---