Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
configure: add --enable-nvenc for static ffmpeg build, fixes #3438
  • Loading branch information
perexg committed Dec 26, 2015
1 parent eec4077 commit 9f8cf9b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Makefile.ffmpeg
Expand Up @@ -138,6 +138,18 @@ DECODERS += h264_vdpau

endif

#
# NVENC
#

ifeq (yes,$(CONFIG_NVENC))

EXTRAARG += --enable-nvenc --enable-nonfree

ENCODERS += nvenc_h264 nvenc_hevc

endif

#
# MFX Dispatcher (libmfx)
#
Expand Down
10 changes: 10 additions & 0 deletions configure
Expand Up @@ -39,6 +39,7 @@ OPTIONS=(
"libx265:no"
"libx265_static:yes"
"vdpau:auto"
"nvenc:auto"
"libmfx:no"
"libmfx_static:yes"
"inotify:auto"
Expand Down Expand Up @@ -426,6 +427,15 @@ if enabled libffmpeg_static; then
fi
fi

# nvenc
if enabled_or_auto nvenc; then
if check_cc_header nvEncodeAPI; then
enable nvenc
elif enabled nvenc; then
die "NVENC library (https://developer.nvidia.com/nvidia-video-codec-sdk) not found"
fi
fi

# libmfx
if enabled libmfx; then
check_cc_lib va || die "libva not found"
Expand Down

0 comments on commit 9f8cf9b

Please sign in to comment.