diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2022-07-24 12:11:49 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2022-07-24 23:06:33 +0300 |
| commit | 6d83c5f87651499dbb5d310f7cbd12a25c7d07f9 (patch) | |
| tree | 60a689f723e7358ecc55504334cba042bdc9ebf0 | |
| parent | e0723b7e4e22492275d476fcd30d759e1198bc5b (diff) | |
| download | ffmpeg-6d83c5f87651499dbb5d310f7cbd12a25c7d07f9.tar.gz | |
configure: properly require libx264 if enabled
When libx264 can not be found even though it is enabled, it should error
out properly instead of silently disabling it.
(cherry picked from commit 564d7946de56155d1c42165a8b561fcf5028cbbc)
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6666,7 +6666,7 @@ enabled libvpx && { enabled libwebp && { enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } -enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && +enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && |