[FFmpeg-cvslog] build: simplify libwebp check
Clément Bœsch
git at videolan.org
Mon Sep 15 23:55:04 CEST 2014
ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Sep 1 09:41:44 2014 +0200| [864d124bb7aa533764f5e4b6063e1615d6815d02] | committer: Clément Bœsch
build: simplify libwebp check
Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=864d124bb7aa533764f5e4b6063e1615d6815d02
---
configure | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/configure b/configure
index b39b6d3..d187dfd 100755
--- a/configure
+++ b/configure
@@ -4860,9 +4860,7 @@ enabled libvpx && {
enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; }
enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || disable libvpx_vp9_encoder; } }
enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack
-enabled libwebp && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion &&
- { check_code cc webp/encode.h "WebPPicture wp; wp.use_argb++" ||
- die "ERROR: libwebp too old."; }
+enabled libwebp && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
{ check_cpp_condition x264.h "X264_BUILD >= 118" ||
die "ERROR: libx264 must be installed and version must be >= 0.118."; }
More information about the ffmpeg-cvslog
mailing list