summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-02-24 22:40:10 +0000
committerReinhard Tartler <siretart@tauware.de>2010-02-24 22:40:10 +0000
commit53b90bb25edfd608cb6ae9201ca42052bb54b62f (patch)
tree7c0aa40d70c5c7b82ca403d7f5f69717fa46fae1 /configure
parenta0244ae347a8d58e88b7cf127e65a51d15d1c157 (diff)
backport libx264.c from trunk
now compiles with x264 API versions 65 up to 85 patch prepared by darkshikari Originally committed as revision 22042 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 3e74ab8311..e96db9e352 100755
--- a/configure
+++ b/configure
@@ -2017,7 +2017,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