[FFmpeg-cvslog] Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'

Michael Niedermayer git at videolan.org
Fri May 22 02:37:24 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 22 02:28:22 2015 +0200| [162644c8331df0ba4e45bf77262f09d2ed98a2e6] | committer: Michael Niedermayer

Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=162644c8331df0ba4e45bf77262f09d2ed98a2e6
---





More information about the ffmpeg-cvslog mailing list