diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-02 23:27:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-02 23:27:53 -0300 |
| commit | 575fc7e80a1beb74f4afd6616f57cb8bfda4dba0 (patch) | |
| tree | 6cb60eb2d5abdcb818395b4103852cc6e63c6711 /libavformat/aiff.h | |
| parent | eaa25b09e4116f2fd649c8638021514911e908c9 (diff) | |
| parent | 0671eb2346c17e8fb13784cf90ce416661fdea1c (diff) | |
| download | ffmpeg-575fc7e80a1beb74f4afd6616f57cb8bfda4dba0.tar.gz | |
Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
* commit '0671eb2346c17e8fb13784cf90ce416661fdea1c':
tls_openssl: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/aiff.h')
0 files changed, 0 insertions, 0 deletions