diff options
| author | Diego Biurrun <diego@biurrun.de> | 2010-08-08 08:51:15 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2010-08-08 08:51:15 +0000 |
| commit | 7d07d6f5298fab6dc3ec40b970ff7e9e6286bcdb (patch) | |
| tree | a2aa38e3978a3853a50d277d66a33f7dfb05d3e5 /configure | |
| parent | f9c8cc4d191a1373ca95e56173b16d04eb6b8630 (diff) | |
| download | ffmpeg-7d07d6f5298fab6dc3ec40b970ff7e9e6286bcdb.tar.gz | |
Only check for for libvpx decoder/encoder if libvpx is enabled.
Originally committed as revision 24744 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -2697,10 +2697,11 @@ 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_all libvpx 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_all libvpx 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 libvpx && { + 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."; } |