diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 13:15:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 13:15:42 +0100 |
| commit | 6ee47bd008ffb1442362fd5e8d3b34f079c23de5 (patch) | |
| tree | b7824315f515b7297c3d424eb603069601f107dc | |
| parent | 78197501572abbad33d7458f5009c5f53ecf021a (diff) | |
| parent | 0d819ed318ded6e7acdebced7da2e6411caa0fd6 (diff) | |
| download | ffmpeg-6ee47bd008ffb1442362fd5e8d3b34f079c23de5.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2
* TimothyGu/release/1.2:
configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3915,7 +3915,7 @@ enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_in enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus enabled libass && require_pkg_config libass ass/ass.h ass_library_init -enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray +enabled libbluray && require_pkg_config libbluray libbluray/bluray.h bd_open enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } |