ffmpeg | branch: release/2.8 | Ricardo Constantino <wiia...@gmail.com> | Mon 
Sep  7 20:58:10 2015 +0100| [aa46ae8848ef871c093099bbee8b52ef73ea7b9c] | 
committer: Timothy Gu

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 <wiia...@gmail.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 2641eeeefe93767e812d0acb9e3cb9bf157e6e95)
Signed-off-by: Timothy Gu <timothyg...@gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa46ae8848ef871c093099bbee8b52ef73ea7b9c
---

 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 91f366e..fd39778 100755
--- a/configure
+++ b/configure
@@ -5261,7 +5261,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
@@ -6264,4 +6264,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"

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to