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)
* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

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

Simple merge