project: Update for recent upstream merge.

SMP/config.asm

@@ -436,7 +436,6 @@
 %define CONFIG_LIBXAVS2 0
 %define CONFIG_LIBXVID 1
 %define CONFIG_DECKLINK 0
-%define CONFIG_LIBNDI_NEWTEK 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
@@ -529,6 +528,7 @@
 %define CONFIG_SNDIO 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
+%define CONFIG_CUDA_NVCC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 1
@@ -1560,7 +1560,6 @@
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_BKTR_INDEV 0
 %define CONFIG_DECKLINK_INDEV 0
-%define CONFIG_LIBNDI_NEWTEK_INDEV 0
 %define CONFIG_DSHOW_INDEV 1
 %define CONFIG_FBDEV_INDEV 0
 %define CONFIG_GDIGRAB_INDEV 1
@@ -1580,7 +1579,6 @@
 %define CONFIG_ALSA_OUTDEV 0
 %define CONFIG_CACA_OUTDEV 0
 %define CONFIG_DECKLINK_OUTDEV 0
-%define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
 %define CONFIG_FBDEV_OUTDEV 0
 %define CONFIG_OPENGL_OUTDEV 1
 %define CONFIG_OSS_OUTDEV 0

SMP/config.h

@@ -486,7 +486,6 @@
 #define CONFIG_LIBXAVS2 0
 #define CONFIG_LIBXVID 1
 #define CONFIG_DECKLINK 0
-#define CONFIG_LIBNDI_NEWTEK 0
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_OPENSSL 0
 #define CONFIG_LIBTLS 0
@@ -579,6 +578,7 @@
 #define CONFIG_SNDIO 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
+#define CONFIG_CUDA_NVCC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 1
@@ -1686,7 +1686,6 @@
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_BKTR_INDEV 0
 #define CONFIG_DECKLINK_INDEV 0
-#define CONFIG_LIBNDI_NEWTEK_INDEV 0
 #define CONFIG_DSHOW_INDEV 1
 #define CONFIG_FBDEV_INDEV 0
 #define CONFIG_GDIGRAB_INDEV 1
@@ -1706,7 +1705,6 @@
 #define CONFIG_ALSA_OUTDEV 0
 #define CONFIG_CACA_OUTDEV 0
 #define CONFIG_DECKLINK_OUTDEV 0
-#define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
 #define CONFIG_FBDEV_OUTDEV 0
 #define CONFIG_OPENGL_OUTDEV 1
 #define CONFIG_OSS_OUTDEV 0