summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2010-08-08 00:06:24 +0000
committerDiego Biurrun <diego@biurrun.de>2010-08-08 00:06:24 +0000
commit762e2601d79cd32c403dd78f81240f7bbb7d10b9 (patch)
treeb3c44dd1ed8d279a7895dee1b3ee12151ba8425a /configure
parent4a384de5b8ced22e05d29e08b885a8d79968adf5 (diff)
Split libvpx check into decoder and encoder check.
This allows using a libvpx that has been configured as decoder/encoder only. patch by Frank Barchard, fbarchard google com Originally committed as revision 24742 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index ff46c1b7d0..1fde1f4157 100755
--- a/configure
+++ b/configure
@@ -2697,9 +2697,10 @@ 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 && { 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 libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
+ die "ERROR: libvpx decoder version must be >=0.9.1"; }
+enabled libvpx_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_enc_init_ver -lvpx ||
+ die "ERROR: libvpx encoder 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."; }