diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:27:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:28:23 +0200 |
| commit | 621d4089a4cff0066d5cfc006cf20d99414ee9f9 (patch) | |
| tree | df4b7bce78139e30b42ace69d91cd9e13ff9e807 | |
| parent | 8b1e920676f6eeeb01422660768f5f92b3811bc6 (diff) | |
| parent | e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0 (diff) | |
| download | ffmpeg-621d4089a4cff0066d5cfc006cf20d99414ee9f9.tar.gz | |
Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0'
* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
configure: Use require_pkg_config for Speex
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4776,7 +4776,7 @@ enabled libsmbclient && { { check_pkg_config smbclient libsmbclient.h smbc_ require smbclient libsmbclient.h smbc_init -lsmbclient; } enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init -enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex +enabled libspeex && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static |