Skip to content

Commit

Permalink
project: Update for recent upstream merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Mar 22, 2019
1 parent e86d203 commit 79de313
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions SMP/x264_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define X264_GPL 1
#define X264_INTERLACED 1
#define X264_CHROMA_FORMAT 0
#define X264_REV 2935
#define X264_REV 2969
#define X264_REV_DIFF 0
#define X264_VERSION " r2935"
#define X264_POINTVER "0.157.2935"
#define X264_VERSION " r2969"
#define X264_POINTVER "0.157.2969"
1 change: 1 addition & 0 deletions SMP/x264cli.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<ClInclude Include="x264_config.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\autocomplete.c" />
<ClCompile Include="..\extras\getopt.c">
<ExcludedFromBuild Condition="'$(Configuration)'=='Debug_10b'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)'=='Release_10b'">true</ExcludedFromBuild>
Expand Down
3 changes: 3 additions & 0 deletions SMP/x264cli.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,8 @@
<ClCompile Include="..\extras\getopt.c">
<Filter>Source Files\getopt</Filter>
</ClCompile>
<ClCompile Include="..\autocomplete.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

0 comments on commit 79de313

Please sign in to comment.