[FFmpeg-cvslog] Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 29 11:42:17 2015 +0200| [42a6a3841868b2150b7a13f35458bd9d2ffeb3e6] | committer: Michael Niedermayer

Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42a6a3841868b2150b7a13f35458bd9d2ffeb3e6
---