diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-02-23 16:39:18 -0800 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-03-06 18:47:29 -0800 |
| commit | 2a45007f3408176a7578fb3896a560b5fc4c2a96 (patch) | |
| tree | 5ba53179f8235b672bd36b806f8cd5d2c239199d | |
| parent | 6fd54e4f2ec08a4065563b25248ad56ba7680015 (diff) | |
| download | ffmpeg-2a45007f3408176a7578fb3896a560b5fc4c2a96.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
@@ -3212,7 +3212,7 @@ enabled frei0r && { check_header frei0r.h || die "ERROR: frei0r.h header not enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init 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 version must be >= 0.11.0."; } |