Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:38 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:43 +0000 (11:31 +0200)
commitbeecbe13a2ea49280554a7178bebc525e538b4e7
tree1acc5f437016f45b69c3eea9a87ab9baf2576ecb
parent4c0b30b07a81727561cafc171a1d0182a5975a48
parent9f1b3050d9e31e9283d818f3640f3460ac8cfb5b
Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'

* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b':
  rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

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