diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:21:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:22:03 +0100 |
| commit | aa3378b579f2835c122b6f89bddb5eb8f9da3fa2 (patch) | |
| tree | edbedc697269a6cb8dd528761db3ffdaa172b7dd | |
| parent | bc07ec7b2f97377c84be046d4e5b057b39486a95 (diff) | |
| parent | 2a45007f3408176a7578fb3896a560b5fc4c2a96 (diff) | |
| download | ffmpeg-aa3378b579f2835c122b6f89bddb5eb8f9da3fa2.tar.gz | |
Merge remote-tracking branch 'TimothyGu/release/0.11' into release/0.11
* TimothyGu/release/0.11:
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
@@ -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."; } |