git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eaa25b0
0671eb2
)
Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
author
James Almer
<jamrial@gmail.com>
Fri, 3 Nov 2017 02:27:53 +0000
(23:27 -0300)
committer
James Almer
<jamrial@gmail.com>
Fri, 3 Nov 2017 02:27:53 +0000
(23:27 -0300)
* commit '
0671eb2346c17e8fb13784cf90ce416661fdea1c
':
tls_openssl: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>
1
2
libavformat/tls_openssl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavformat/tls_openssl.c
Simple merge