summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-04-19 19:37:31 +0000
committerMåns Rullgård <mans@mansr.com>2010-04-19 19:37:31 +0000
commit60877ad941f22738dadde20d63f0894af7853484 (patch)
tree6f24bf9f462b0a1b011e10340fdfb1d09807348a /configure
parent73f3f30de55620ccfbb6effe123560ce6248ed8e (diff)
Revert "Fix libx264 configure check to use pkg-config if available."
There are problems using pkg-config, and a better solution is being worked on. Originally committed as revision 22914 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index da67718750..02ea987755 100755
--- a/configure
+++ b/configure
@@ -2612,7 +2612,7 @@ 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 libx264 && require libx264 x264.h x264_encoder_encode $(pkg-config --libs x264 2> /dev/null) -lx264 -lm &&
+enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 83" ||
die "ERROR: libx264 version must be >= 0.83."; }
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore