From 762e2601d79cd32c403dd78f81240f7bbb7d10b9 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Sun, 8 Aug 2010 00:06:24 +0000 Subject: [PATCH] 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 --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ff46c1b..1fde1f4 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."; } -- 2.7.4