Skip to content

Commit

Permalink
projects: Update for recent upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Aug 28, 2016
1 parent ff2977c commit 8d7ac27
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 0 deletions.
8 changes: 8 additions & 0 deletions SMP/config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1775,6 +1775,7 @@
%define CONFIG_HWDOWNLOAD_FILTER 1
%define CONFIG_HWUPLOAD_FILTER 1
%define CONFIG_HWUPLOAD_CUDA_FILTER 0
%define CONFIG_HYSTERESIS_FILTER 1
%define CONFIG_IDET_FILTER 1
%define CONFIG_IL_FILTER 1
%define CONFIG_INFLATE_FILTER 1
Expand All @@ -1784,13 +1785,17 @@
%define CONFIG_LENSCORRECTION_FILTER 1
%define CONFIG_LOOP_FILTER 1
%define CONFIG_LUT_FILTER 1
%define CONFIG_LUT2_FILTER 1
%define CONFIG_LUT3D_FILTER 1
%define CONFIG_LUTRGB_FILTER 1
%define CONFIG_LUTYUV_FILTER 1
%define CONFIG_MASKEDCLAMP_FILTER 1
%define CONFIG_MASKEDMERGE_FILTER 1
%define CONFIG_MCDEINT_FILTER 1
%define CONFIG_MERGEPLANES_FILTER 1
%define CONFIG_MESTIMATE_FILTER 1
%define CONFIG_METADATA_FILTER 1
%define CONFIG_MINTERPOLATE_FILTER 1
%define CONFIG_MPDECIMATE_FILTER 1
%define CONFIG_NEGATE_FILTER 1
%define CONFIG_NNEDI_FILTER 1
Expand Down Expand Up @@ -1860,6 +1865,7 @@
%define CONFIG_TRIM_FILTER 1
%define CONFIG_UNSHARP_FILTER 1
%define CONFIG_USPP_FILTER 1
%define CONFIG_VAGUEDENOISER_FILTER 1
%define CONFIG_VECTORSCOPE_FILTER 1
%define CONFIG_VFLIP_FILTER 1
%define CONFIG_VIDSTABDETECT_FILTER 0
Expand Down Expand Up @@ -1888,6 +1894,7 @@
%define CONFIG_SMPTEHDBARS_FILTER 1
%define CONFIG_TESTSRC_FILTER 1
%define CONFIG_TESTSRC2_FILTER 1
%define CONFIG_YUVTESTSRC_FILTER 1
%define CONFIG_NULLSINK_FILTER 1
%define CONFIG_ADRAWGRAPH_FILTER 1
%define CONFIG_AHISTOGRAM_FILTER 1
Expand Down Expand Up @@ -2005,6 +2012,7 @@
%define CONFIG_F4V_MUXER 1
%define CONFIG_FFM_MUXER 1
%define CONFIG_FFMETADATA_MUXER 1
%define CONFIG_FIFO_MUXER 0
%define CONFIG_FILMSTRIP_MUXER 1
%define CONFIG_FLAC_MUXER 1
%define CONFIG_FLV_MUXER 1
Expand Down
8 changes: 8 additions & 0 deletions SMP/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,7 @@
#define CONFIG_HWDOWNLOAD_FILTER 1
#define CONFIG_HWUPLOAD_FILTER 1
#define CONFIG_HWUPLOAD_CUDA_FILTER 0
#define CONFIG_HYSTERESIS_FILTER 1
#define CONFIG_IDET_FILTER 1
#define CONFIG_IL_FILTER 1
#define CONFIG_INFLATE_FILTER 1
Expand All @@ -1834,13 +1835,17 @@
#define CONFIG_LENSCORRECTION_FILTER 1
#define CONFIG_LOOP_FILTER 1
#define CONFIG_LUT_FILTER 1
#define CONFIG_LUT2_FILTER 1
#define CONFIG_LUT3D_FILTER 1
#define CONFIG_LUTRGB_FILTER 1
#define CONFIG_LUTYUV_FILTER 1
#define CONFIG_MASKEDCLAMP_FILTER 1
#define CONFIG_MASKEDMERGE_FILTER 1
#define CONFIG_MCDEINT_FILTER 1
#define CONFIG_MERGEPLANES_FILTER 1
#define CONFIG_MESTIMATE_FILTER 1
#define CONFIG_METADATA_FILTER 1
#define CONFIG_MINTERPOLATE_FILTER 1
#define CONFIG_MPDECIMATE_FILTER 1
#define CONFIG_NEGATE_FILTER 1
#define CONFIG_NNEDI_FILTER 1
Expand Down Expand Up @@ -1910,6 +1915,7 @@
#define CONFIG_TRIM_FILTER 1
#define CONFIG_UNSHARP_FILTER 1
#define CONFIG_USPP_FILTER 1
#define CONFIG_VAGUEDENOISER_FILTER 1
#define CONFIG_VECTORSCOPE_FILTER 1
#define CONFIG_VFLIP_FILTER 1
#define CONFIG_VIDSTABDETECT_FILTER 0
Expand Down Expand Up @@ -1938,6 +1944,7 @@
#define CONFIG_SMPTEHDBARS_FILTER 1
#define CONFIG_TESTSRC_FILTER 1
#define CONFIG_TESTSRC2_FILTER 1
#define CONFIG_YUVTESTSRC_FILTER 1
#define CONFIG_NULLSINK_FILTER 1
#define CONFIG_ADRAWGRAPH_FILTER 1
#define CONFIG_AHISTOGRAM_FILTER 1
Expand Down Expand Up @@ -2065,6 +2072,7 @@
#define CONFIG_F4V_MUXER 1
#define CONFIG_FFM_MUXER 1
#define CONFIG_FFMETADATA_MUXER 1
#define CONFIG_FIFO_MUXER 0
#define CONFIG_FILMSTRIP_MUXER 1
#define CONFIG_FLAC_MUXER 1
#define CONFIG_FLV_MUXER 1
Expand Down
1 change: 1 addition & 0 deletions SMP/libavcodec.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@
<ClCompile Include="..\libavcodec\aliaspixenc.c" />
<ClCompile Include="..\libavcodec\alsdec.c" />
<ClCompile Include="..\libavcodec\bgmc.c" />
<ClCompile Include="..\libavcodec\mlz.c" />
<ClCompile Include="..\libavcodec\amrnbdec.c" />
<ClCompile Include="..\libavcodec\celp_filters.c" />
<ClCompile Include="..\libavcodec\celp_math.c" />
Expand Down
3 changes: 3 additions & 0 deletions SMP/libavcodec.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,9 @@
<ClCompile Include="..\libavcodec\bgmc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mlz.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\amrnbdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
Expand Down
7 changes: 7 additions & 0 deletions SMP/libavfilter.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,18 @@
<ClCompile Include="..\libavfilter\vf_hue.c" />
<ClCompile Include="..\libavfilter\vf_hwdownload.c" />
<ClCompile Include="..\libavfilter\vf_hwupload.c" />
<ClCompile Include="..\libavfilter\vf_hysteresis.c" />
<ClCompile Include="..\libavfilter\vf_il.c" />
<ClCompile Include="..\libavfilter\vf_kerndeint.c" />
<ClCompile Include="..\libavfilter\vf_lenscorrection.c" />
<ClCompile Include="..\libavfilter\vf_lut.c" />
<ClCompile Include="..\libavfilter\vf_lut2.c" />
<ClCompile Include="..\libavfilter\vf_maskedclamp.c" />
<ClCompile Include="..\libavfilter\vf_mcdeint.c" />
<ClCompile Include="..\libavfilter\vf_mergeplanes.c" />
<ClCompile Include="..\libavfilter\vf_mestimate.c" />
<ClCompile Include="..\libavfilter\motion_estimation.c" />
<ClCompile Include="..\libavfilter\vf_minterpolate.c" />
<ClCompile Include="..\libavfilter\vf_mpdecimate.c" />
<ClCompile Include="..\libavfilter\vf_nnedi.c" />
<ClCompile Include="..\libavfilter\vf_noise.c" />
Expand Down Expand Up @@ -293,6 +299,7 @@
<ClCompile Include="..\libavfilter\vf_transpose.c" />
<ClCompile Include="..\libavfilter\vf_unsharp.c" />
<ClCompile Include="..\libavfilter\vf_uspp.c" />
<ClCompile Include="..\libavfilter\vf_vaguedenoiser.c" />
<ClCompile Include="..\libavfilter\vf_vectorscope.c" />
<ClCompile Include="..\libavfilter\vf_vflip.c" />
<ClCompile Include="..\libavfilter\vf_vignette.c" />
Expand Down
21 changes: 21 additions & 0 deletions SMP/libavfilter.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@
<ClCompile Include="..\libavfilter\vf_hwupload.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_hysteresis.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_il.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand All @@ -561,12 +564,27 @@
<ClCompile Include="..\libavfilter\vf_lut.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_lut2.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedclamp.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_mcdeint.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_mergeplanes.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_mestimate.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\motion_estimation.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_minterpolate.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_mpdecimate.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down Expand Up @@ -699,6 +717,9 @@
<ClCompile Include="..\libavfilter\vf_uspp.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_vaguedenoiser.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_vectorscope.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
Expand Down

0 comments on commit 8d7ac27

Please sign in to comment.