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)
* commit '94599a6de3822b13c94096d764868128f388ba28':
  tls: Remove all the local polling loops

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

Simple merge