Skip to content

Commit

Permalink
project: Update for 1.10.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Mar 29, 2021
1 parent 57b3cf8 commit 60c38f8
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 10 deletions.
45 changes: 42 additions & 3 deletions SMP/libvpx.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
<Filter Include="Header Files\libvpx\vpx_util">
<UniqueIdentifier>{0f1488e1-b863-436b-a38e-233c1a2e23d6}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\libvpx\vpx\internal">
<UniqueIdentifier>{b0c7e733-ec6f-46fd-a3f9-aea2e4952d9f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="vpx_config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx_mem\vpx_mem.h">
<Filter>Header Files\libvpx\vpx_mem</Filter>
</ClInclude>
Expand Down Expand Up @@ -708,6 +708,42 @@
<ClInclude Include="..\vpx_ports\static_assert.h">
<Filter>Header Files\libvpx\vpx_ports</Filter>
</ClInclude>
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h">
<Filter>Header Files\libvpx\vpx\internal</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8cx.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8dx.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_codec.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_decoder.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_encoder.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_frame_buffer.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_image.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_integer.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_ext_ratectrl.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\vpx\src\vpx_encoder.c">
Expand Down Expand Up @@ -1379,6 +1415,9 @@
<ClCompile Include="..\vp9\vp9_iface_common.c">
<Filter>Source Files\libvpx\vp9</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\vp9_ext_ratectrl.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down
12 changes: 12 additions & 0 deletions SMP/libvpx_files.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<ClInclude Include="..\vp9\encoder\vp9_encoder.h" />
<ClInclude Include="..\vp9\encoder\vp9_ethread.h" />
<ClInclude Include="..\vp9\encoder\vp9_extend.h" />
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h" />
<ClInclude Include="..\vp9\encoder\vp9_firstpass.h" />
<ClInclude Include="..\vp9\encoder\vp9_job_queue.h" />
<ClInclude Include="..\vp9\encoder\vp9_lookahead.h" />
Expand All @@ -126,6 +127,16 @@
<ClInclude Include="..\vp9\encoder\vp9_treewriter.h" />
<ClInclude Include="..\vp9\vp9_dx_iface.h" />
<ClInclude Include="..\vp9\vp9_iface_common.h" />
<ClInclude Include="..\vpx\vp8.h" />
<ClInclude Include="..\vpx\vp8cx.h" />
<ClInclude Include="..\vpx\vp8dx.h" />
<ClInclude Include="..\vpx\vpx_codec.h" />
<ClInclude Include="..\vpx\vpx_decoder.h" />
<ClInclude Include="..\vpx\vpx_encoder.h" />
<ClInclude Include="..\vpx\vpx_ext_ratectrl.h" />
<ClInclude Include="..\vpx\vpx_frame_buffer.h" />
<ClInclude Include="..\vpx\vpx_image.h" />
<ClInclude Include="..\vpx\vpx_integer.h" />
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h" />
<ClInclude Include="..\vpx_dsp\bitreader.h" />
<ClInclude Include="..\vpx_dsp\bitreader_buffer.h" />
Expand Down Expand Up @@ -312,6 +323,7 @@
<ClCompile Include="..\vp9\encoder\vp9_encodemv.c" />
<ClCompile Include="..\vp9\encoder\vp9_encoder.c" />
<ClCompile Include="..\vp9\encoder\vp9_ethread.c" />
<ClCompile Include="..\vp9\encoder\vp9_ext_ratectrl.c" />
<ClCompile Include="..\vp9\encoder\vp9_extend.c" />
<ClCompile Include="..\vp9\encoder\vp9_firstpass.c" />
<ClCompile Include="..\vp9\encoder\vp9_frame_scale.c" />
Expand Down
45 changes: 42 additions & 3 deletions SMP/libvpx_winrt.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
<Filter Include="Header Files\libvpx\vpx_util">
<UniqueIdentifier>{0f1488e1-b863-436b-a38e-233c1a2e23d6}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\libvpx\vpx\internal">
<UniqueIdentifier>{3590f06d-61c2-4c33-a48e-3b5ca64f44ea}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="vpx_config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx_mem\vpx_mem.h">
<Filter>Header Files\libvpx\vpx_mem</Filter>
</ClInclude>
Expand Down Expand Up @@ -708,6 +708,42 @@
<ClInclude Include="..\vpx_ports\static_assert.h">
<Filter>Header Files\libvpx\vpx_ports</Filter>
</ClInclude>
<ClInclude Include="..\vpx\internal\vpx_codec_internal.h">
<Filter>Header Files\libvpx\vpx\internal</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8cx.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vp8dx.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_codec.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_decoder.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_encoder.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_ext_ratectrl.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_frame_buffer.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_image.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vpx\vpx_integer.h">
<Filter>Header Files\libvpx\vpx</Filter>
</ClInclude>
<ClInclude Include="..\vp9\encoder\vp9_ext_ratectrl.h">
<Filter>Header Files\libvpx\vp9\encoder</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\vpx\src\vpx_encoder.c">
Expand Down Expand Up @@ -1379,6 +1415,9 @@
<ClCompile Include="..\vp9\vp9_iface_common.c">
<Filter>Source Files\libvpx\vp9</Filter>
</ClCompile>
<ClCompile Include="..\vp9\encoder\vp9_ext_ratectrl.c">
<Filter>Source Files\libvpx\vp9\encoder</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libvpx.def">
Expand Down
2 changes: 1 addition & 1 deletion SMP/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ When using the WinRT/UWP project configurations the projects will automatically
the default application target for the Version of Visual Studio being used:
VS 2013: 8.1
VS 2015: 8.1
VS 2017: 10.0.10240.0
VS 2017+: 10.0.10240.0


*** Building with YASM ***
Expand Down
6 changes: 3 additions & 3 deletions SMP/vpx_version.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This file is generated. Do not edit.
#define VERSION_MAJOR 1
#define VERSION_MINOR 9
#define VERSION_MINOR 10
#define VERSION_PATCH 0
#define VERSION_EXTRA ""
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.9.0"
#define VERSION_STRING " v1.9.0"
#define VERSION_STRING_NOSP "v1.10.0"
#define VERSION_STRING " v1.10.0"

0 comments on commit 60c38f8

Please sign in to comment.