diff options
author | Clément Bœsch <clement@stupeflix.com> | 2014-09-01 09:41:44 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2014-09-15 23:54:34 +0200 |
commit | 864d124bb7aa533764f5e4b6063e1615d6815d02 (patch) | |
tree | a11f1ab651abf251e85692bbe6e4dc2a59246162 /configure | |
parent | 21561610560fbde5a398d467b6d061ab3ac1c62e (diff) | |
download | ffmpeg-streaming-864d124bb7aa533764f5e4b6063e1615d6815d02.zip ffmpeg-streaming-864d124bb7aa533764f5e4b6063e1615d6815d02.tar.gz |
build: simplify libwebp check
Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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."; } |