[FFmpeg-devel] [PATCH] build: simplify libwebp check

Clément Bœsch u at pkh.me
Mon Sep 1 09:49:09 CEST 2014


From: Clément Bœsch <clement at stupeflix.com>

Check is simpler, faster, and explicits the required version.

Tested (compilation and runtime) with libwebp v0.2.0, v0.2.1 and v0.4.1.

origin/0.2.0 is the oldest available branch in the Git repository.
---
 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index 80f2748..e59ee7c 100755
--- a/configure
+++ b/configure
@@ -4848,9 +4848,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."; }
-- 
2.1.0



More information about the ffmpeg-devel mailing list