From 7a73145bd783dd22f3ced43986a75731d769e321 Mon Sep 17 00:00:00 2001
From: Fredy P <fredy.pulido@savoirfairelinux.com>
Date: Mon, 9 Dec 2019 10:53:14 -0500
Subject: [PATCH] ffmpeg: nvidia flags only for linux 386 and x64

Flags nvenc, nvdec and cuvid only for Linux desktop i386 / x86_64

Change-Id: If5406611602dba23e02ebce281aeaeb43bc4d53c
---
 contrib/src/ffmpeg/rules.mak | 39 ++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 32e32b1b63..300197a2e2 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
-- 
GitLab