diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 32e32b1b63f021b914324922a0738d7294ff49c6..300197a2e290b024bfa2503d9633c2001e1b779f 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -223,18 +223,35 @@ FFMPEGCONF += \ --enable-hwaccel=mjpeg_vaapi \ --enable-encoder=h264_vaapi \ --enable-encoder=vp8_vaapi \ - --enable-encoder=mjpeg_vaapi \ - --enable-cuvid \ - --enable-ffnvcodec \ - --enable-nvdec \ - --enable-nvenc \ - --enable-hwaccel=h264_nvdec \ - --enable-hwaccel=hevc_nvdec \ - --enable-hwaccel=vp8_nvdec \ - --enable-hwaccel=mjpeg_nvdec \ - --enable-encoder=h264_nvenc \ - --enable-encoder=hevc_nvenc + --enable-encoder=mjpeg_vaapi +# ffnvcodec is not supported on ARM then we enable it here for i386 and x86_64 +ifeq ($(ARCH),i386) +FFMPEGCONF += --enable-cuvid \ + --enable-ffnvcodec \ + --enable-nvdec \ + --enable-nvenc \ + --enable-hwaccel=h264_nvdec \ + --enable-hwaccel=hevc_nvdec \ + --enable-hwaccel=vp8_nvdec \ + --enable-hwaccel=mjpeg_nvdec \ + --enable-encoder=h264_nvenc \ + --enable-encoder=hevc_nvenc +endif +ifeq ($(ARCH),x86_64) +FFMPEGCONF += --enable-cuvid \ + --enable-ffnvcodec \ + --enable-nvdec \ + --enable-nvenc \ + --enable-hwaccel=h264_nvdec \ + --enable-hwaccel=hevc_nvdec \ + --enable-hwaccel=vp8_nvdec \ + --enable-hwaccel=mjpeg_nvdec \ + --enable-encoder=h264_nvenc \ + --enable-encoder=hevc_nvenc +endif +# End Desktop Linux: endif +# End HAVE_LINUX: endif ifdef HAVE_MACOSX