[FFmpeg-cvslog] configure: use pkg-config for libx264

Vittorio Giovara git at videolan.org
Fri Jun 13 02:55:13 CEST 2014


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Jun 10 17:46:57 2014 -0400| [4321e507564b2d8a5dfc630f8d6fefba6fdc1e92] | committer: Vittorio Giovara

configure: use pkg-config for libx264

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4321e507564b2d8a5dfc630f8d6fefba6fdc1e92
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 4ed6f16..61cd2d4 100755
--- a/configure
+++ b/configure
@@ -4096,7 +4096,7 @@ enabled libvpx            && {
     enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx" -lvpx || disable libvpx_vp9_encoder; } }
 enabled libwavpack        && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput  -lwavpack
 enabled libwebp           && require_pkg_config libwebp webp/encode.h WebPGetEncoderVersion
-enabled libx264           && require libx264 x264.h x264_encoder_encode -lx264 &&
+enabled libx264           && require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode &&
                              { check_cpp_condition x264.h "X264_BUILD >= 118" ||
                                die "ERROR: libx264 version must be >= 0.118."; }
 enabled libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&



More information about the ffmpeg-cvslog mailing list