diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-04-19 19:34:37 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-04-19 19:34:37 +0000 |
| commit | 73f3f30de55620ccfbb6effe123560ce6248ed8e (patch) | |
| tree | 20f132f282df9340aff01d75ca8b3dba2e1f59d3 | |
| parent | 1840b280592b31ae59b5fac79eb1478ef81ec75c (diff) | |
| download | ffmpeg-73f3f30de55620ccfbb6effe123560ce6248ed8e.tar.gz | |
Fix libx264 configure check to use pkg-config if available.
Originally committed as revision 22913 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 -lx264 -lm && +enabled libx264 && require libx264 x264.h x264_encoder_encode $(pkg-config --libs x264 2> /dev/null) -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 |