Created
December 6, 2015 16:17
-
-
Save BtbN/18ffe94bde0d84286c52 to your computer and use it in GitHub Desktop.
stdin
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index d61c2aa..ccc8833 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -279,7 +279,6 @@ External library support: | |
--disable-lzma disable lzma [autodetect] | |
--enable-decklink enable Blackmagic DeckLink I/O support [no] | |
--enable-mmal enable decoding via MMAL [no] | |
- --enable-nvenc enable NVIDIA NVENC support [no] | |
--enable-openal enable OpenAL 1.1 capture support [no] | |
--enable-opencl enable OpenCL code | |
--enable-opengl enable OpenGL rendering [no] | |
@@ -1504,7 +1503,6 @@ EXTERNAL_LIBRARY_LIST=" | |
libzvbi | |
lzma | |
mmal | |
- nvenc | |
openal | |
opencl | |
opengl | |
@@ -2649,9 +2647,6 @@ libxvid_encoder_deps="libxvid" | |
libutvideo_decoder_deps="libutvideo" | |
libutvideo_encoder_deps="libutvideo" | |
libzvbi_teletext_decoder_deps="libzvbi" | |
-nvenc_encoder_deps="nvenc" | |
-nvenc_h264_encoder_deps="nvenc" | |
-nvenc_hevc_encoder_deps="nvenc" | |
# demuxers / muxers | |
ac3_demuxer_select="ac3_parser" | |
@@ -4803,7 +4798,6 @@ die_license_disabled gpl x11grab | |
die_license_disabled nonfree libaacplus | |
die_license_disabled nonfree libfaac | |
-die_license_disabled nonfree nvenc | |
enabled gpl && die_license_disabled_gpl nonfree libfdk_aac | |
enabled gpl && die_license_disabled_gpl nonfree openssl | |
@@ -5497,10 +5491,6 @@ enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect | |
check_lib interface/mmal/mmal.h mmal_port_connect ; } | |
check_lib interface/mmal/mmal.h mmal_port_connect ; } || | |
die "ERROR: mmal not found"; } | |
-enabled nvenc && { check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; } && | |
- { check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || | |
- die "ERROR: NVENC API version 4 or older is not supported"; } && | |
- { [ $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"; } && | |
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c | |
index 43b8e78..9e448f9 100644 | |
--- a/libavcodec/nvenc.c | |
+++ b/libavcodec/nvenc.c | |
@@ -25,7 +25,7 @@ | |
#include <dlfcn.h> | |
#endif | |
-#include <nvEncodeAPI.h> | |
+#include "nvenc.h" | |
#include "libavutil/internal.h" | |
#include "libavutil/imgutils.h" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment