[FFmpeg-cvslog] configure: fix libopus detection

James Almer git at videolan.org
Thu May 4 06:27:07 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May  4 00:26:13 2017 -0300| [c53bf8c9b8ad7a2dc786d5749598c4ac67c4ad2d] | committer: James Almer

configure: fix libopus detection

Prevents compilation failures on libopus < 1.0.3
Regression since 37941878.

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

 configure | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index c3fa9d858f..695356a349 100755
--- a/configure
+++ b/configure
@@ -5806,7 +5806,14 @@ enabled libopenjpeg       && { { check_lib libopenjpeg openjpeg-2.1/openjpeg.h o
                                { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                die "ERROR: libopenjpeg not found"; }
 enabled libopenmpt        && require_pkg_config "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create
-enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
+enabled libopus           && {
+    enabled libopus_decoder && {
+        require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
+    }
+    enabled libopus_encoder && {
+        require_pkg_config opus opus_multistream.h opus_multistream_surround_encoder_create
+    }
+}
 enabled libpulse          && require_pkg_config libpulse pulse/pulseaudio.h pa_context_new
 enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
 enabled librubberband     && require_pkg_config "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new



More information about the ffmpeg-cvslog mailing list