mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-01 00:54:33 +02:00
configure: Allow linking to openssl
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
2d1b6fb72b
commit
a060866fd7
8
configure
vendored
8
configure
vendored
@ -190,6 +190,7 @@ External library support:
|
|||||||
--enable-libxvid enable Xvid encoding via xvidcore,
|
--enable-libxvid enable Xvid encoding via xvidcore,
|
||||||
native MPEG-4/Xvid encoder exists [no]
|
native MPEG-4/Xvid encoder exists [no]
|
||||||
--enable-mlib enable Sun medialib [no]
|
--enable-mlib enable Sun medialib [no]
|
||||||
|
--enable-openssl enable openssl [no]
|
||||||
--enable-zlib enable zlib [autodetect]
|
--enable-zlib enable zlib [autodetect]
|
||||||
|
|
||||||
Advanced options (experts only):
|
Advanced options (experts only):
|
||||||
@ -960,6 +961,7 @@ CONFIG_LIST="
|
|||||||
mpegaudiodsp
|
mpegaudiodsp
|
||||||
network
|
network
|
||||||
nonfree
|
nonfree
|
||||||
|
openssl
|
||||||
pic
|
pic
|
||||||
postproc
|
postproc
|
||||||
rdft
|
rdft
|
||||||
@ -2572,6 +2574,7 @@ die_license_disabled gpl libxvid
|
|||||||
die_license_disabled gpl x11grab
|
die_license_disabled gpl x11grab
|
||||||
|
|
||||||
die_license_disabled nonfree libfaac
|
die_license_disabled nonfree libfaac
|
||||||
|
die_license_disabled nonfree openssl
|
||||||
|
|
||||||
die_license_disabled version3 libopencore_amrnb
|
die_license_disabled version3 libopencore_amrnb
|
||||||
die_license_disabled version3 libopencore_amrwb
|
die_license_disabled version3 libopencore_amrwb
|
||||||
@ -2917,6 +2920,10 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
|
|||||||
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
|
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
|
||||||
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
|
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
|
||||||
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
|
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
|
||||||
|
enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
|
||||||
|
check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
|
||||||
|
check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
|
||||||
|
die "ERROR: openssl not found"; }
|
||||||
|
|
||||||
# libdc1394 check
|
# libdc1394 check
|
||||||
if enabled libdc1394; then
|
if enabled libdc1394; then
|
||||||
@ -3196,6 +3203,7 @@ echo "libvpx enabled ${libvpx-no}"
|
|||||||
echo "libx264 enabled ${libx264-no}"
|
echo "libx264 enabled ${libx264-no}"
|
||||||
echo "libxavs enabled ${libxavs-no}"
|
echo "libxavs enabled ${libxavs-no}"
|
||||||
echo "libxvid enabled ${libxvid-no}"
|
echo "libxvid enabled ${libxvid-no}"
|
||||||
|
echo "openssl enabled ${openssl-no}"
|
||||||
echo "zlib enabled ${zlib-no}"
|
echo "zlib enabled ${zlib-no}"
|
||||||
echo "bzlib enabled ${bzlib-no}"
|
echo "bzlib enabled ${bzlib-no}"
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user