Merge commit 'd8ffb205'

* commit 'd8ffb205':
  lavf: split tls.c

Conflicts:
	libavformat/tls.c
	libavformat/tls_gnutls.c
	libavformat/tls_openssl.c

See: 4a006b9eMerged-by: Michael Niedermayer <michaelni@gmx.at>