diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-02-23 16:39:18 -0800 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-03-06 17:56:28 -0800 |
| commit | cea57b7fe05bea6a8935082d03eb1974c8a06e37 (patch) | |
| tree | 5f02b9354331c9042a55cc1f4c0b1169cfb66507 | |
| parent | fcd46cfbbd90564232dc10a2d4753bf0f251ae98 (diff) | |
| download | ffmpeg-cea57b7fe05bea6a8935082d03eb1974c8a06e37.tar.gz | |
configure: use pkg-config to detect libbluray
The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Conflicts:
configure
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3637,7 +3637,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."; } |