projects: Update for recent upstream merge.

ShiftMediaProject · Sep 11, 2016 · 5e55240 · 5e55240
1 parent 06729d0
commit 5e55240
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -1146,8 +1146,13 @@
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
 %define CONFIG_LIBOPENH264_DECODER 0
+%define CONFIG_H263_CUVID_DECODER 0
 %define CONFIG_H264_CUVID_DECODER 0
 %define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_MJPEG_CUVID_DECODER 0
+%define CONFIG_MPEG1_CUVID_DECODER 0
+%define CONFIG_MPEG2_CUVID_DECODER 0
+%define CONFIG_MPEG4_CUVID_DECODER 0
 %define CONFIG_VC1_CUVID_DECODER 0
 %define CONFIG_VP8_CUVID_DECODER 0
 %define CONFIG_VP9_CUVID_DECODER 0
@@ -1705,6 +1710,7 @@
 %define CONFIG_ALPHAMERGE_FILTER 1
 %define CONFIG_ASS_FILTER 1
 %define CONFIG_ATADENOISE_FILTER 1
+%define CONFIG_AVGBLUR_FILTER 1
 %define CONFIG_BBOX_FILTER 1
 %define CONFIG_BENCH_FILTER 1
 %define CONFIG_BITPLANENOISE_FILTER 1
@@ -1763,6 +1769,7 @@
 %define CONFIG_FRAMESTEP_FILTER 1
 %define CONFIG_FREI0R_FILTER 0
 %define CONFIG_FSPP_FILTER 1
+%define CONFIG_GBLUR_FILTER 1
 %define CONFIG_GEQ_FILTER 1
 %define CONFIG_GRADFUN_FILTER 1
 %define CONFIG_HALDCLUT_FILTER 1
@@ -1913,6 +1920,7 @@
 %define CONFIG_SPECTRUMSYNTH_FILTER 1
 %define CONFIG_AMOVIE_FILTER 1
 %define CONFIG_MOVIE_FILTER 1
+%define CONFIG_H263_CUVID_HWACCEL 0
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_H264_CUVID_HWACCEL 0
@@ -1932,9 +1940,12 @@
 %define CONFIG_HEVC_QSV_HWACCEL 1
 %define CONFIG_HEVC_VAAPI_HWACCEL 0
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
+%define CONFIG_MJPEG_CUVID_HWACCEL 0
+%define CONFIG_MPEG1_CUVID_HWACCEL 0
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
 %define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MPEG2_CUVID_HWACCEL 0
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
@@ -1943,6 +1954,7 @@
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MPEG4_CUVID_HWACCEL 0
 %define CONFIG_MPEG4_MMAL_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0

diff --git a/SMP/config.h b/SMP/config.h
@@ -1196,8 +1196,13 @@
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
 #define CONFIG_LIBOPENH264_DECODER 0
+#define CONFIG_H263_CUVID_DECODER 0
 #define CONFIG_H264_CUVID_DECODER 0
 #define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_MJPEG_CUVID_DECODER 0
+#define CONFIG_MPEG1_CUVID_DECODER 0
+#define CONFIG_MPEG2_CUVID_DECODER 0
+#define CONFIG_MPEG4_CUVID_DECODER 0
 #define CONFIG_VC1_CUVID_DECODER 0
 #define CONFIG_VP8_CUVID_DECODER 0
 #define CONFIG_VP9_CUVID_DECODER 0
@@ -1755,6 +1760,7 @@
 #define CONFIG_ALPHAMERGE_FILTER 1
 #define CONFIG_ASS_FILTER 1
 #define CONFIG_ATADENOISE_FILTER 1
+#define CONFIG_AVGBLUR_FILTER 1
 #define CONFIG_BBOX_FILTER 1
 #define CONFIG_BENCH_FILTER 1
 #define CONFIG_BITPLANENOISE_FILTER 1
@@ -1813,6 +1819,7 @@
 #define CONFIG_FRAMESTEP_FILTER 1
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FSPP_FILTER 1
+#define CONFIG_GBLUR_FILTER 1
 #define CONFIG_GEQ_FILTER 1
 #define CONFIG_GRADFUN_FILTER 1
 #define CONFIG_HALDCLUT_FILTER 1
@@ -1963,6 +1970,7 @@
 #define CONFIG_SPECTRUMSYNTH_FILTER 1
 #define CONFIG_AMOVIE_FILTER 1
 #define CONFIG_MOVIE_FILTER 1
+#define CONFIG_H263_CUVID_HWACCEL 0
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_H264_CUVID_HWACCEL 0
@@ -1982,9 +1990,12 @@
 #define CONFIG_HEVC_QSV_HWACCEL 1
 #define CONFIG_HEVC_VAAPI_HWACCEL 0
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
+#define CONFIG_MJPEG_CUVID_HWACCEL 0
+#define CONFIG_MPEG1_CUVID_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG2_CUVID_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
@@ -1993,6 +2004,7 @@
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG4_CUVID_HWACCEL 0
 #define CONFIG_MPEG4_MMAL_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0

diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
@@ -174,13 +174,14 @@
     <ClCompile Include="..\libavfilter\af_vibrato.c" />
     <ClCompile Include="..\libavfilter\af_volumedetect.c" />
     <ClCompile Include="..\libavfilter\asrc_anoisesrc.c" />
+    <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
     <ClCompile Include="..\libavfilter\asrc_sine.c" />
     <ClCompile Include="..\libavfilter\asink_anullsink.c" />
-    <ClCompile Include="..\libavfilter\asrc_anullsrc.c" />
     <ClCompile Include="..\libavfilter\vf_extractplanes.c" />
     <ClCompile Include="..\libavfilter\vf_alphamerge.c" />
     <ClCompile Include="..\libavfilter\vf_subtitles.c" />
     <ClCompile Include="..\libavfilter\vf_atadenoise.c" />
+    <ClCompile Include="..\libavfilter\vf_avgblur.c" />
     <ClCompile Include="..\libavfilter\bbox.c" />
     <ClCompile Include="..\libavfilter\vf_bbox.c" />
     <ClCompile Include="..\libavfilter\vf_bitplanenoise.c" />
@@ -233,6 +234,7 @@
     <ClCompile Include="..\libavfilter\vf_framepack.c" />
     <ClCompile Include="..\libavfilter\vf_framerate.c" />
     <ClCompile Include="..\libavfilter\vf_framestep.c" />
+    <ClCompile Include="..\libavfilter\vf_gblur.c" />
     <ClCompile Include="..\libavfilter\vf_geq.c" />
     <ClCompile Include="..\libavfilter\vf_lut3d.c" />
     <ClCompile Include="..\libavfilter\vf_hflip.c" />
@@ -309,10 +311,10 @@
     <ClCompile Include="..\libavfilter\vf_zoompan.c" />
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />
-    <ClCompile Include="..\libavfilter\vsink_nullsink.c" />
     <ClCompile Include="..\libavfilter\vsrc_life.c" />
     <ClCompile Include="..\libavfilter\vsrc_mandelbrot.c" />
     <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c" />
+    <ClCompile Include="..\libavfilter\vsink_nullsink.c" />
     <ClCompile Include="..\libavfilter\avf_ahistogram.c" />
     <ClCompile Include="..\libavfilter\avf_aphasemeter.c" />
     <ClCompile Include="..\libavfilter\avf_avectorscope.c" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -342,13 +342,13 @@
     <ClCompile Include="..\libavfilter\asrc_anoisesrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\asrc_sine.c">
+    <ClCompile Include="..\libavfilter\asrc_anullsrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\asink_anullsink.c">
+    <ClCompile Include="..\libavfilter\asrc_sine.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\asrc_anullsrc.c">
+    <ClCompile Include="..\libavfilter\asink_anullsink.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_extractplanes.c">
@@ -363,6 +363,9 @@
     <ClCompile Include="..\libavfilter\vf_atadenoise.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_avgblur.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\bbox.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -519,6 +522,9 @@
     <ClCompile Include="..\libavfilter\vf_framestep.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_gblur.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_geq.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -747,9 +753,6 @@
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vsink_nullsink.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_life.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -759,6 +762,9 @@
     <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vsink_nullsink.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\avf_ahistogram.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>