[FFmpeg-cvslog] configure: properly require libx264 if enabled
Marvin Scholz
git at videolan.org
Sun Jul 24 23:09:46 EEST 2022
ffmpeg | branch: release/5.1 | Marvin Scholz <epirat07 at gmail.com> | Sun Jul 24 12:11:49 2022 +0200| [6d83c5f87651499dbb5d310f7cbd12a25c7d07f9] | committer: Jan Ekström
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)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d83c5f87651499dbb5d310f7cbd12a25c7d07f9
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 9d6457d81b..6e012e44bc 100755
--- a/configure
+++ b/configure
@@ -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"; } &&
More information about the ffmpeg-cvslog
mailing list