projects: Update for recent upstream merge.

ShiftMediaProject · Sep 4, 2016 · f495ad2 · f495ad2
1 parent 643603a
commit f495ad2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -332,6 +332,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_LSTAT 0
 %define HAVE_LZO1X_999_COMPRESS 0
@@ -1874,6 +1875,7 @@
 %define CONFIG_VSTACK_FILTER 1
 %define CONFIG_W3FDIF_FILTER 1
 %define CONFIG_WAVEFORM_FILTER 1
+%define CONFIG_WEAVE_FILTER 1
 %define CONFIG_XBR_FILTER 1
 %define CONFIG_YADIF_FILTER 1
 %define CONFIG_ZMQ_FILTER 0
@@ -2012,7 +2014,7 @@
 %define CONFIG_F4V_MUXER 1
 %define CONFIG_FFM_MUXER 1
 %define CONFIG_FFMETADATA_MUXER 1
-%define CONFIG_FIFO_MUXER 0
+%define CONFIG_FIFO_MUXER 1
 %define CONFIG_FILMSTRIP_MUXER 1
 %define CONFIG_FLAC_MUXER 1
 %define CONFIG_FLV_MUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -362,6 +362,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_LSTAT 0
 #define HAVE_LZO1X_999_COMPRESS 0
@@ -1924,6 +1925,7 @@
 #define CONFIG_VSTACK_FILTER 1
 #define CONFIG_W3FDIF_FILTER 1
 #define CONFIG_WAVEFORM_FILTER 1
+#define CONFIG_WEAVE_FILTER 1
 #define CONFIG_XBR_FILTER 1
 #define CONFIG_YADIF_FILTER 1
 #define CONFIG_ZMQ_FILTER 0
@@ -2072,7 +2074,7 @@
 #define CONFIG_F4V_MUXER 1
 #define CONFIG_FFM_MUXER 1
 #define CONFIG_FFMETADATA_MUXER 1
-#define CONFIG_FIFO_MUXER 0
+#define CONFIG_FIFO_MUXER 1
 #define CONFIG_FILMSTRIP_MUXER 1
 #define CONFIG_FLAC_MUXER 1
 #define CONFIG_FLV_MUXER 1

diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
@@ -304,6 +304,7 @@
     <ClCompile Include="..\libavfilter\vf_vflip.c" />
     <ClCompile Include="..\libavfilter\vf_vignette.c" />
     <ClCompile Include="..\libavfilter\vf_waveform.c" />
+    <ClCompile Include="..\libavfilter\vf_weave.c" />
     <ClCompile Include="..\libavfilter\vf_xbr.c" />
     <ClCompile Include="..\libavfilter\vf_zoompan.c" />
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -732,6 +732,9 @@
     <ClCompile Include="..\libavfilter\vf_waveform.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_weave.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_xbr.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
@@ -221,6 +221,7 @@
     <ClCompile Include="..\libavformat\ffmenc.c" />
     <ClCompile Include="..\libavformat\ffmetadec.c" />
     <ClCompile Include="..\libavformat\ffmetaenc.c" />
+    <ClCompile Include="..\libavformat\fifo.c" />
     <ClCompile Include="..\libavformat\filmstripdec.c" />
     <ClCompile Include="..\libavformat\filmstripenc.c" />
     <ClCompile Include="..\libavformat\flacdec.c" />

diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
@@ -484,6 +484,9 @@
     <ClCompile Include="..\libavformat\ffmetaenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\fifo.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\filmstripdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

diff --git a/SMP/readme.txt b/SMP/readme.txt
@@ -57,12 +57,6 @@ However the following is a list of extra dependency options that require externa
     1) opengl (requires glext)
 		a) Download glext.h and wglext.h from opengl.org.
 		b) Save the header files into OutputDir/include/gl/*.
-    2) nvenc (requires NVIDIA Video Codec SDK, recommended to also enable cuda)
-        a) Enable cuda as above.
-		b) Download the "NVIDIA Video Codec SDK" from the NVIDIA website.
-		c) Copy 'nvEncodeAPI.h' from the "NVIDIA Video Codec SDK" into the installed %CUDA%/include folder 
-			(where %CUDA% is the location that the CUDA SDK was installed) or into OutputDir/include if CUDA
-            is not available.
 
 *OutputDir is the "Output Directory" specified in the project properties. 
 The default value of OutputDir is "..\..\msvc" relative to the FFmpeg source directory. An example of the expected