summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-09-02 22:53:31 +0000
committerMåns Rullgård <mans@mansr.com>2009-09-02 22:53:31 +0000
commite69bb386a29d8f3d351e8c06eb36f0e9173a827a (patch)
tree0660d0bb2175c9d8d350a783e7f2e6cc8d2de820
parente0b1d6605b204edfbb98d798d97cec9283d9511b (diff)
configure: fix check for x264
libx264 recently started mangling the name of x264_encoder_open() to prevent version mismatches, breaking our test. Checking for another function instead makes it work again. Originally committed as revision 19754 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 5c13369ef7..4a8d523e40 100755
--- a/configure
+++ b/configure
@@ -2283,7 +2283,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/theora.h theora_info_init -ltheora -logg
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libx264 && require libx264 x264.h x264_encoder_open -lx264 -lm &&
+enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 65" ||
die "ERROR: libx264 version must be >= 0.65."; }
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore