Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:28:22 +0000 (02:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 00:28:27 +0000 (02:28 +0200)
commit162644c8331df0ba4e45bf77262f09d2ed98a2e6
tree382db9f9a2d1e5c23ada70bdcebe24407ff029f5
parent6b56fcbd10a56d2a7a116c0de4ee032b895456c2
parentd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02
Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'

* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
  tls: Use custom IO to read from the URLContext

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