projects: Update for recent upstream merge.

Disabled nvenc until the 2 separate implementations get sorted out.

projects: Update for recent upstream merge.
Disabled nvenc until the 2 separate implementations get sorted out.
007ff392 · Matt Oliver · b57ab5ce · 007ff392 · 007ff392 · 007ff392
6 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -46,6 +46,7 @@
 %define HAVE_ALTIVEC 0
 %define HAVE_DCBZL 0
 %define HAVE_LDBRX 0
+%define HAVE_POWER8 0
 %define HAVE_PPC4XX 0
 %define HAVE_VSX 0
 %define HAVE_AMD3DNOW 1
@@ -84,6 +85,7 @@
 %define HAVE_ALTIVEC_EXTERNAL 0
 %define HAVE_DCBZL_EXTERNAL 0
 %define HAVE_LDBRX_EXTERNAL 0
+%define HAVE_POWER8_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
 %define HAVE_VSX_EXTERNAL 0
 %define HAVE_AMD3DNOW_EXTERNAL 1
@@ -122,6 +124,7 @@
 %define HAVE_ALTIVEC_INLINE 0
 %define HAVE_DCBZL_INLINE 0
 %define HAVE_LDBRX_INLINE 0
+%define HAVE_POWER8_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
 %define HAVE_VSX_INLINE 0
 %define HAVE_AMD3DNOW_INLINE 1
@@ -192,6 +195,7 @@
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 1
+%define HAVE_CUDA_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 %define HAVE_DEV_IC_BT8XX_H 0
@@ -281,6 +285,7 @@
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 1
+%define HAVE_LOADLIBRARY 1
 %define HAVE_LOCALTIME_R 0
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
@@ -329,8 +334,6 @@
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
 %define HAVE_CONDITION_VARIABLE_PTR 1
-%define HAVE_DXVA_PICPARAMS_HEVC 1
-%define HAVE_ID3D11VIDEODECODER 1
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -466,7 +469,7 @@
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 1
 %define CONFIG_MMAL 0
-%define CONFIG_NVENC 1
+%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 1
 %define CONFIG_OPENGL 1
@@ -545,6 +548,7 @@
 %define CONFIG_FMTCONVERT 1
 %define CONFIG_FRAME_THREAD_ENCODER 1
 %define CONFIG_GCRYPT 1
+%define CONFIG_GMP 1
 %define CONFIG_GOLOMB 1
 %define CONFIG_GPLV3 1
 %define CONFIG_H263DSP 1
@@ -571,7 +575,6 @@
 %define CONFIG_MPEGAUDIODSP 1
 %define CONFIG_MPEGVIDEO 1
 %define CONFIG_MPEGVIDEOENC 1
-%define CONFIG_NETTLE 1
 %define CONFIG_PIXBLOCKDSP 1
 %define CONFIG_QPELDSP 1
 %define CONFIG_QSV 1
@@ -1289,8 +1292,8 @@
 %define CONFIG_MSMPEG4V2_ENCODER 1
 %define CONFIG_MSMPEG4V3_ENCODER 1
 %define CONFIG_MSVIDEO1_ENCODER 1
-%define CONFIG_NVENC_ENCODER 1
-%define CONFIG_NVENC_H265_ENCODER 1
+%define CONFIG_NVENC_ENCODER 0
+%define CONFIG_NVENC_H265_ENCODER 0
 %define CONFIG_PAM_ENCODER 1
 %define CONFIG_PBM_ENCODER 1
 %define CONFIG_PCX_ENCODER 1
@@ -1422,7 +1425,9 @@
 %define CONFIG_LIBXVID_ENCODER 1
 %define CONFIG_LIBAACPLUS_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_ADELAY_FILTER 1
 %define CONFIG_AECHO_FILTER 1
 %define CONFIG_AEVAL_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
 /* Automatically generated by SMP project_generate - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --enable-libmfx --toolchain=msvc"
+#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-libmfx --toolchain=msvc"
 #define FFMPEG_LICENSE "nonfree and unredistributable"
 #define CONFIG_THIS_YEAR 2015
 #define FFMPEG_DATADIR "."
@@ -73,6 +73,7 @@
 #define HAVE_ALTIVEC 0
 #define HAVE_DCBZL 0
 #define HAVE_LDBRX 0
+#define HAVE_POWER8 0
 #define HAVE_PPC4XX 0
 #define HAVE_VSX 0
 #define HAVE_AMD3DNOW 1
@@ -111,6 +112,7 @@
 #define HAVE_ALTIVEC_EXTERNAL 0
 #define HAVE_DCBZL_EXTERNAL 0
 #define HAVE_LDBRX_EXTERNAL 0
+#define HAVE_POWER8_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
 #define HAVE_VSX_EXTERNAL 0
 #define HAVE_AMD3DNOW_EXTERNAL 1
@@ -149,6 +151,7 @@
 #define HAVE_ALTIVEC_INLINE 0
 #define HAVE_DCBZL_INLINE 0
 #define HAVE_LDBRX_INLINE 0
+#define HAVE_POWER8_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
 #define HAVE_VSX_INLINE 0
 #define HAVE_AMD3DNOW_INLINE HAVE_INLINE_ASM
@@ -223,6 +226,7 @@
 #define HAVE_ASM_TYPES_H 0
 #define HAVE_CDIO_PARANOIA_H 0
 #define HAVE_CDIO_PARANOIA_PARANOIA_H 1
+#define HAVE_CUDA_H 0
 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
 #define HAVE_DEV_IC_BT8XX_H 0
@@ -312,6 +316,7 @@
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 1
+#define HAVE_LOADLIBRARY 1
 #define HAVE_LOCALTIME_R 0
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
@@ -368,8 +373,6 @@
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 1
 #define HAVE_CONDITION_VARIABLE_PTR 1
-#define HAVE_DXVA_PICPARAMS_HEVC 1
-#define HAVE_ID3D11VIDEODECODER 1
 #define HAVE_SOCKLEN_T 1
 #define HAVE_STRUCT_ADDRINFO 1
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -505,7 +508,7 @@
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 1
 #define CONFIG_MMAL 0
-#define CONFIG_NVENC 1
+#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 1
 #define CONFIG_OPENGL 1
@@ -592,6 +595,7 @@
 #define CONFIG_FMTCONVERT 1
 #define CONFIG_FRAME_THREAD_ENCODER 1
 #define CONFIG_GCRYPT 1
+#define CONFIG_GMP 1
 #define CONFIG_GOLOMB 1
 #define CONFIG_GPLV3 1
 #define CONFIG_H263DSP 1
@@ -618,7 +622,6 @@
 #define CONFIG_MPEGAUDIODSP 1
 #define CONFIG_MPEGVIDEO 1
 #define CONFIG_MPEGVIDEOENC 1
-#define CONFIG_NETTLE 1
 #define CONFIG_PIXBLOCKDSP 1
 #define CONFIG_QPELDSP 1
 #define CONFIG_QSV 1
@@ -1336,8 +1339,8 @@
 #define CONFIG_MSMPEG4V2_ENCODER 1
 #define CONFIG_MSMPEG4V3_ENCODER 1
 #define CONFIG_MSVIDEO1_ENCODER 1
-#define CONFIG_NVENC_ENCODER 1
-#define CONFIG_NVENC_H265_ENCODER 1
+#define CONFIG_NVENC_ENCODER 0
+#define CONFIG_NVENC_H265_ENCODER 0
 #define CONFIG_PAM_ENCODER 1
 #define CONFIG_PBM_ENCODER 1
 #define CONFIG_PCX_ENCODER 1
@@ -1469,7 +1472,9 @@
 #define CONFIG_LIBXVID_ENCODER 1
 #define CONFIG_LIBAACPLUS_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_ADELAY_FILTER 1
 #define CONFIG_AECHO_FILTER 1
 #define CONFIG_AEVAL_FILTER 1

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -479,6 +479,9 @@
    <ClCompile Include="..\libavcodec\mpegutils.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\mpegvideodata.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\mpegvideo_enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -494,9 +497,6 @@
    <ClCompile Include="..\libavcodec\mpegvideoencdsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\pixblockdsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/project_generate/project_generate_icl.bat
+++ b/SMP/project_generate/project_generate_icl.bat
 cd bin
-project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --toolchain=icl
\ No newline at end of file
+project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --toolchain=icl
\ No newline at end of file
--- a/SMP/project_generate/project_generate_msvc.bat
+++ b/SMP/project_generate/project_generate_msvc.bat
 cd bin
-project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-nvenc --enable-libmfx --toolchain=msvc
\ No newline at end of file
+project_generate.exe --enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --enable-librtmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-opencl --enable-libmfx --toolchain=msvc
\ No newline at end of file