ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Fri May  6 
19:42:35 2016 +0200| [017d42ebc60f66b94d13aeeeabcec284486872e9] | committer: 
Carl Eugen Hoyos

configure: Only utvideo <= 15.3.0 is supported.

Fixes ticket #5511.

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

 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 18c4376..df82eb2 100755
--- a/configure
+++ b/configure
@@ -5608,7 +5608,9 @@ enabled libtheora         && require libtheora 
theora/theoraenc.h th_info_init -
 enabled libtwolame        && require libtwolame twolame.h twolame_init 
-ltwolame &&
                              { check_lib twolame.h 
twolame_encode_buffer_float32_interleaved -ltwolame ||
                                die "ERROR: libtwolame must be installed and 
version must be >= 0.3.10"; }
-enabled libutvideo        && require_cpp utvideo "stdint.h stdlib.h 
utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++
+enabled libutvideo        && { require_cpp utvideo "stdint.h stdlib.h 
utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++ &&
+                               check_cpp_condition utvideo/utvideo.h 
"!defined(UTVIDEO_VERSION_MAJOR) || UTVIDEO_VERSION_MAJOR < 15 || 
UTVIDEO_VERSION_MAJOR == 15 && UTVIDEO_VERSION_MINOR < 4" ||
+                               die "ERROR: libutvideo version must be <= 
15.3.0."; }
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
 enabled libvidstab        && require_pkg_config "vidstab >= 0.98" 
vid.stab/libvidstab.h vsMotionDetectInit
 enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h 
E_IF_init -lvo-amrwbenc

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

Reply via email to