diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:48:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:48:27 +0100 |
| commit | 8418de295a9a202e940355b882c35f69c02b9b02 (patch) | |
| tree | 5505d12ec0961c0af239a40d9674ed7524e9e03f | |
| parent | e59fe789581324ac48b669caed0ac61fa05902a2 (diff) | |
| parent | cea57b7fe05bea6a8935082d03eb1974c8a06e37 (diff) | |
| download | ffmpeg-8418de295a9a202e940355b882c35f69c02b9b02.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/1.0' into release/1.0
* TimothyGu/release/1.0:
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
@@ -3639,7 +3639,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."; } |