Merge commit '94599a6de3822b13c94096d764868128f388ba28'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:49:34 +0000 (02:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:49:38 +0000 (02:49 +0200)
commita0124b89e393812ff273ffc2f7e0f044c66a287c
tree44ed39d9dcd6b8637e61742a5461f73e25ee9ef9
parent9221e362fd3b4821db5a79cb2d04a12c715235de
parent94599a6de3822b13c94096d764868128f388ba28
Merge commit '94599a6de3822b13c94096d764868128f388ba28'

* commit '94599a6de3822b13c94096d764868128f388ba28':
  tls: Remove all the local polling loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/tls.c