Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:43:49 +0000 (12:43 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:43:49 +0000 (12:43 +0100)
commit2c47d243585a090ec90c97109a44f2a6d13d5f7c
treed8694a2760572fc1caa2f28682c34a78f7b33b46
parent761bbb06ff591343b3e1ec141bb23cb2dfe502d0
parent016387fe0fe3eff1a03ec0673bf4d2967f6cad94
Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'

* commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94':
  rtmpdh: Don't use the OpenSSL DH struct

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/rtmpdh.c
libavformat/rtmpdh.h