diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:42:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-29 11:42:22 +0200 |
commit | 42a6a3841868b2150b7a13f35458bd9d2ffeb3e6 (patch) | |
tree | 4404dbf76f1cb8f98cdf059f884aa046aa319235 /libavformat/pcm.h | |
parent | 48e02e258c42ae2ee0d351f2f0bd620b087ababe (diff) | |
parent | 8016a1bd3b60e917e1b12748dd80c06c3462c286 (diff) | |
download | ffmpeg-42a6a3841868b2150b7a13f35458bd9d2ffeb3e6.tar.gz |
Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'
* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcm.h')
0 files changed, 0 insertions, 0 deletions