diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-01-11 11:12:38 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-01-11 11:12:38 +0100 |
| commit | af964baf090616fbd858e8937d95bf1f1d8be277 (patch) | |
| tree | e80ce8cb68d8d7c1875749e0ffbf5bc118b65708 | |
| parent | 7fcbebbeafd106d5bab82b272076f7ceb5bc4a73 (diff) | |
| download | ffmpeg-af964baf090616fbd858e8937d95bf1f1d8be277.tar.gz | |
configure: Simplify detection of static x264 on systems without pkg-config.
Fixes a regression since 6dfcbd80.
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5939,7 +5939,7 @@ 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 || - { require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 && + { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && warn "using libx264 without pkg-config"; } } && require_cpp_condition x264.h "X264_BUILD >= 118" && { check_cpp_condition x264.h "X264_MPEG2" && |