[FFmpeg-cvslog] Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 27 22:17:04 2015 +0200| [fbf9583f9f88b24e0cb7c35b253193ae8f35e93d] | committer: Michael Niedermayer

Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'

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

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

See: 4a006b9eb7e7d736fd00e6045b5612978ef6404b
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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