---
configure | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 7c463a5..ebd01d9 100755
--- a/configure
+++ b/configure
@@ -243,6 +243,7 @@ External library support:
--enable-libnut enable NUT (de)muxing via libnut,
native (de)muxer exists [no]
--enable-libnpp enable NVIDIA Performance Primitives-based code [no]
+ --disable-libnpp-static disable using static version of libnpp [autodetect]
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb
[no]
--enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
--enable-libopencv enable video filtering via libopencv [no]
@@ -1490,6 +1491,7 @@ EXTERNAL_LIBRARY_LIST="
libmp3lame
libnut
libnpp
+ libnpp_static
libopencore_amrnb
libopencore_amrwb
libopencv
@@ -5620,7 +5622,15 @@ enabled libmfx && require_pkg_config libmfx
"mfx/mfxvideo.h" MFXInit
enabled libmodplug && require_pkg_config libmodplug
libmodplug/modplug.h ModPlug_Load
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
-enabled libnpp && require libnpp npp.h nppGetLibVersion -lnppi
-lnppc
+enabled libnpp && { { if ! disabled libnpp_static; then
+ check_lib npp.h nppGetLibVersion
-lnppi_static -lnppc_static -lcudart_static -lculibos $ldl ||
+ check_lib npp.h nppGetLibVersion
-lnppi_static -lnppc_static -lcudart_static -lculibos $ldl -lstdc++ ||
+ check_lib npp.h nppGetLibVersion
-lnppi_static -lnppc_static -lcudart_static -lculibos $ldl -lstdc++ -lrt
+ else false; fi; } ||
+ { if ! enabled libnpp_static; then
+ check_lib npp.h nppGetLibVersion -lnppi -lnppc
+ else false; fi; } ||
+ die "ERROR: libnpp not found"; }
enabled libopencore_amrnb && require libopencore_amrnb
opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h
D_IF_init -lopencore-amrwb
enabled libopencv && { check_header opencv2/core/core_c.h &&
--
2.8.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
