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

Trivial merge