[FFmpeg-cvslog] configure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack
Michael Niedermayer
git at videolan.org
Thu Dec 11 05:02:49 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 11 03:47:53 2014 +0100| [dbdc6e554e48673d43799321911700cb091c9e8e] | committer: Michael Niedermayer
configure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack
Suggested-by: James Almer <jamrial at gmail.com>
Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbdc6e554e48673d43799321911700cb091c9e8e
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e6257ca..9d04ee2 100755
--- a/configure
+++ b/configure
@@ -4934,7 +4934,8 @@ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled libzmq && require_pkg_config libzmq zmq.h zmq_ctx_new
enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi
-enabled nvenc && { check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; }
+enabled nvenc && { check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; } &&
+ { [ $target_os != cygwin ] || die "ERROR: NVENC is not supported on Cygwin currently."; }
enabled openal && { { for al_libs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do
check_lib 'AL/al.h' alGetError "${al_libs}" && break; done } ||
die "ERROR: openal not found"; } &&
More information about the ffmpeg-cvslog
mailing list