Permalink
Browse files

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

  • Loading branch information...
mean
mean committed Sep 19, 2016
1 parent 2f9286f commit 69b5efcdcf9ef0f5b754869cd347bfb96755d7ff
Showing with 2 additions and 1 deletion.
  1. +1 −0 cmake/admFFmpegBuild.cmake
  2. +1 −1 cmake/admMainChecks.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)
@@ -152,7 +152,7 @@ INCLUDE(admCheckLibVA)
checkVDPAU()
#checkXvba()
checkLibVA()
-#checkNvEnc()
+checkNvEnc()
ENDIF(NOT PLUGINS)
########################################

0 comments on commit 69b5efc

Please sign in to comment.