summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2015-09-07 20:58:10 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-09 14:02:55 +0200
commit2641eeeefe93767e812d0acb9e3cb9bf157e6e95 (patch)
tree976b2348f24a4e250da3b2e8397f3286d13021ea /configure
parent8bf2d3e468821e542660b528fb8f89f616ee6e0b (diff)
downloadffmpeg-streaming-2641eeeefe93767e812d0acb9e3cb9bf157e6e95.zip
ffmpeg-streaming-2641eeeefe93767e812d0acb9e3cb9bf157e6e95.tar.gz
configure: add libsoxr to swresample's pkgconfig
Fixes linking in FFMS and f265 at least, when ffmpeg is compiled with libsoxr. Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index cd0c22a..056feea 100755
--- a/configure
+++ b/configure
@@ -5271,7 +5271,7 @@ enabled libshine && require_pkg_config shine shine/layer3.h shine_encod
enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h smbc_init ||
require smbclient libsmbclient.h smbc_init -lsmbclient; }
enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init
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
@@ -6273,4 +6273,4 @@ pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVF
pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" ""
pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$LIBM"
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM"
-pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM"
+pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM $LIBSOXR"
OpenPOWER on IntegriCloud