Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Mierzejewski <dominik@rangers.eu.org>2010-07-03 23:14:19 +0400
committerDominik Mierzejewski <dominik@rangers.eu.org>2010-07-03 23:14:19 +0400
commit4be7bc6a84780dfbf1c76a0ece311d93c07e2f7d (patch)
treee3b982b7dc81a2fbf5266e09910761940315e4b4 /configure
parent42ebfc54b839a687f803b0353cfc64cfd492cba1 (diff)
Provide a hint about the minimum required version of libvpx (0.9.1)
when detection fails. Approved by Måns. Originally committed as revision 24027 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index dceb4b5c77..954c5a07fc 100755
--- a/configure
+++ b/configure
@@ -2556,8 +2556,9 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libvpx && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx &&
- require2 libvpx "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver" -lvpx
+enabled libvpx && check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx &&
+ check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_enc_init_ver -lvpx ||
+ die "ERROR: libvpx version must be >=0.9.1"
enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
{ check_cpp_condition x264.h "X264_BUILD >= 98" ||
die "ERROR: libx264 version must be >= 0.98."; }