diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 11:52:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 11:54:16 +0200 |
| commit | 1617a89cf000cfb811c1c1ae4119321f41b9fbf7 (patch) | |
| tree | 05195641ff0ce9dc6b88ad8e5b8b4910fa47cf8d /tools | |
| parent | e91fbfd9cf17270d78c73add53fada4c217fdb5e (diff) | |
| parent | 29216d7fd14d1cec16821867d17c90b5c49e8c07 (diff) | |
| download | ffmpeg-1617a89cf000cfb811c1c1ae4119321f41b9fbf7.tar.gz | |
Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'
* commit '29216d7fd14d1cec16821867d17c90b5c49e8c07':
tls: fix compilation when both gnutls and openssl are enabled
See: e91fbfd9cf17270d78c73add53fada4c217fdb5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions