[nvenc] Re-enable nvenc. You *need* SDK v6.0 for it to work, not 5 nor 7

mean00 · Sep 19, 2016 · 69b5efc · 69b5efc
1 parent 2f9286f
commit 69b5efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmake/admFFmpegBuild.cmake b/cmake/admFFmpegBuild.cmake
@@ -47,6 +47,7 @@ IF(USE_NVENC)
    SET(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} nvenc)
    xadd("--enable-nonfree")
    xadd("--enable-nvenc")
+   set(FFMPEG_ENCODERS  ${FFMPEG_ENCODERS} nvenc_h264)
 ENDIF(USE_NVENC)
 
 if (NOT CROSS)

diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
@@ -152,7 +152,7 @@ INCLUDE(admCheckLibVA)
 checkVDPAU()
 #checkXvba()
 checkLibVA()
-#checkNvEnc()
+checkNvEnc()
 ENDIF(NOT PLUGINS)
 
 ########################################