Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:42:17 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:42:22 +0000 (11:42 +0200)
commit42a6a3841868b2150b7a13f35458bd9d2ffeb3e6
tree4404dbf76f1cb8f98cdf059f884aa046aa319235
parent48e02e258c42ae2ee0d351f2f0bd620b087ababe
parent8016a1bd3b60e917e1b12748dd80c06c3462c286
Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'

* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

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