hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 11:24:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Rename config module to cfg.

Browse source 
Prevents a conflict with config.h and src/config.h so that the config.h
generated by configure is included in global.h. Fixes problems with
large input files on 32-bit systems.
This commit is contained in:
Arttu Ylä-Outinen 2016-01-25 12:08:27 +02:00
parent 9feb2f6dbd
commit 49677810b5
15 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/kvazaar_lib/kvazaar_lib.vcxproj
View file

@ -129,7 +129,7 @@
<ClCompile Include="..\..\src\kvazaar.c" />
<ClCompile Include="..\..\src\bitstream.c" />
<ClCompile Include="..\..\src\cabac.c" />
<ClCompile Include="..\..\src\config.c" />
<ClCompile Include="..\..\src\cfg.c" />
<ClCompile Include="..\..\src\context.c" />
<ClCompile Include="..\..\src\cu.c" />
<ClCompile Include="..\..\src\encoder.c" />
@ -224,7 +224,7 @@
<ItemGroup>
<ClInclude Include="..\..\src\bitstream.h" />
<ClInclude Include="..\..\src\cabac.h" />
<ClInclude Include="..\..\src\config.h" />
<ClInclude Include="..\..\src\cfg.h" />
<ClInclude Include="..\..\src\context.h" />
<ClInclude Include="..\..\src\encoder.h" />
<ClInclude Include="..\..\src\encoderstate.h" />
@ -278,4 +278,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\yasm\vsyasm.targets" />
</ImportGroup>
</Project>
</Project>

6
build/kvazaar_lib/kvazaar_lib.vcxproj.filters
View file

@ -144,7 +144,7 @@
<ClCompile Include="..\..\src\bitstream.c">
<Filter>CABAC</Filter>
</ClCompile>
<ClCompile Include="..\..\src\config.c">
<ClCompile Include="..\..\src\cfg.c">
<Filter>Control</Filter>
</ClCompile>
<ClCompile Include="..\..\src\filter.c">
@ -218,7 +218,7 @@
<ClInclude Include="..\..\src\context.h">
<Filter>CABAC</Filter>
</ClInclude>
<ClInclude Include="..\..\src\config.h">
<ClInclude Include="..\..\src\cfg.h">
<Filter>Control</Filter>
</ClInclude>
<ClInclude Include="..\..\src\encoder.h">
@ -394,4 +394,4 @@
<Filter>Optimization\strategies\x86_asm</Filter>
</YASM>
</ItemGroup>
</Project>
</Project>

4
src/Makefile.am
View file

@ -39,8 +39,8 @@ libkvazaar_la_SOURCES = \
cabac.h \
checkpoint.c \
checkpoint.h \
config.c \
config.h \
cfg.c \
cfg.h \
context.c \
context.h \
cu.c \

2
src/config.c → src/cfg.c
View file

@ -18,7 +18,7 @@
* with Kvazaar. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#include "config.h"
#include "cfg.h"
#include <stdio.h>
#include <stdlib.h>

0
src/config.h → src/cfg.h
View file

1
src/context.c
View file

@ -24,7 +24,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "encoder.h"

2
src/encoder.c
View file

@ -26,7 +26,7 @@
#include <assert.h>
#include "tables.h"
#include "config.h"
#include "cfg.h"
#include "cabac.h"
#include "image.h"
#include "nal.h"

1
src/encoder.h
View file

@ -31,7 +31,6 @@
#include "image.h"
#include "bitstream.h"
#include "cabac.h"
#include "config.h"
#include "tables.h"
#include "scalinglist.h"
#include "threadqueue.h"

1
src/encoderstate.c
View file

@ -26,7 +26,6 @@
#include <assert.h>
#include "tables.h"
#include "config.h"
#include "cabac.h"
#include "image.h"
#include "nal.h"

1
src/encoderstate.h
View file

@ -33,7 +33,6 @@
#include "image.h"
#include "bitstream.h"
#include "cabac.h"
#include "config.h"
#include "tables.h"
#include "scalinglist.h"
#include "threadqueue.h"

1
src/filter.c
View file

@ -25,7 +25,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "bitstream.h"
#include "videoframe.h"
#include "cabac.h"

1
src/inter.c
View file

@ -24,7 +24,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "filter.h"
#include "strategies/strategies-ipol.h"
#include "strategies/generic/ipol-generic.h"

2
src/kvazaar.c
View file

@ -22,7 +22,7 @@
#include <stdlib.h>
#include "config.h"
#include "cfg.h"
#include "encoder.h"
#include "strategyselector.h"
#include "encoderstate.h"

1
src/nal.c
View file

@ -25,7 +25,6 @@
#include <string.h>
#include <assert.h>
#include "config.h"
#include "bitstream.h"
#include "cabac.h"
#include "encoder.h"

1
src/transform.c
View file

@ -25,7 +25,6 @@
#include <stdlib.h>
#include <assert.h>
#include "config.h"
#include "nal.h"
#include "rdo.h"
#include "strategies/strategies-dct.h"