Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:37:23 +0000 (02:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:38:11 +0000 (02:38 +0200)
commit9221e362fd3b4821db5a79cb2d04a12c715235de
tree9f18e8f3e14dbce2e9eba29c4e42fcac9d1f1ebe
parent162644c8331df0ba4e45bf77262f09d2ed98a2e6
parentd13b124eaf452b267480074b2e6946538ed03a6e
Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
  tls: Remove the nonblocking code

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