Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
a060866f
Commit
a060866f
authored
14 years ago
by
Martin Storsjö
Browse files
Options
Downloads
Patches
Plain Diff
configure: Allow linking to openssl
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
2d1b6fb7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+8
-0
8 additions, 0 deletions
configure
with
8 additions
and
0 deletions
configure
+
8
−
0
View file @
a060866f
...
...
@@ -190,6 +190,7 @@ External library support:
--enable-libxvid enable Xvid encoding via xvidcore,
native MPEG-4/Xvid encoder exists [no]
--enable-mlib enable Sun medialib [no]
--enable-openssl enable openssl [no]
--enable-zlib enable zlib [autodetect]
Advanced options (experts only):
...
...
@@ -960,6 +961,7 @@ CONFIG_LIST="
mpegaudiodsp
network
nonfree
openssl
pic
postproc
rdft
...
...
@@ -2572,6 +2574,7 @@ die_license_disabled gpl libxvid
die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac
die_license_disabled nonfree openssl
die_license_disabled version3 libopencore_amrnb
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 libxvid
&&
require libxvid xvid.h xvid_global
-lxvidcore
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
if
enabled libdc1394
;
then
...
...
@@ -3196,6 +3203,7 @@ echo "libvpx enabled ${libvpx-no}"
echo
"libx264 enabled
${
libx264
-no
}
"
echo
"libxavs enabled
${
libxavs
-no
}
"
echo
"libxvid enabled
${
libxvid
-no
}
"
echo
"openssl enabled
${
openssl
-no
}
"
echo
"zlib enabled
${
zlib
-no
}
"
echo
"bzlib enabled
${
bzlib
-no
}
"
echo
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment