[FFmpeg-cvslog] configure: properly require libx264 if enabled

Marvin Scholz git at videolan.org
Sun Jul 24 17:45:43 EEST 2022


ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Jul 24 12:11:49 2022 +0200| [564d7946de56155d1c42165a8b561fcf5028cbbc] | 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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=564d7946de56155d1c42165a8b561fcf5028cbbc
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 46f6490a64..6629d14099 100755
--- a/configure
+++ b/configure
@@ -6673,7 +6673,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