Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3307] trunk/OpenMPT
|
From: <man...@us...> - 2013-11-25 13:39:54
|
Revision: 3307
http://sourceforge.net/p/modplug/code/3307
Author: manxorist
Date: 2013-11-25 13:39:38 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
[Var] Update flac to v1.3.0.
Modified Paths:
--------------
trunk/OpenMPT/build/flac.vcproj
trunk/OpenMPT/build/flac.vcxproj
trunk/OpenMPT/build/flac.vcxproj.filters
trunk/OpenMPT/include/flac/AUTHORS
trunk/OpenMPT/include/flac/COPYING.Xiph
trunk/OpenMPT/include/flac/README
trunk/OpenMPT/include/flac/include/FLAC/all.h
trunk/OpenMPT/include/flac/include/FLAC/assert.h
trunk/OpenMPT/include/flac/include/FLAC/callback.h
trunk/OpenMPT/include/flac/include/FLAC/export.h
trunk/OpenMPT/include/flac/include/FLAC/format.h
trunk/OpenMPT/include/flac/include/FLAC/metadata.h
trunk/OpenMPT/include/flac/include/FLAC/ordinals.h
trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h
trunk/OpenMPT/include/flac/include/FLAC/stream_encoder.h
trunk/OpenMPT/include/flac/include/share/alloc.h
trunk/OpenMPT/include/flac/src/libFLAC/bitmath.c
trunk/OpenMPT/include/flac/src/libFLAC/bitreader.c
trunk/OpenMPT/include/flac/src/libFLAC/bitwriter.c
trunk/OpenMPT/include/flac/src/libFLAC/cpu.c
trunk/OpenMPT/include/flac/src/libFLAC/crc.c
trunk/OpenMPT/include/flac/src/libFLAC/fixed.c
trunk/OpenMPT/include/flac/src/libFLAC/float.c
trunk/OpenMPT/include/flac/src/libFLAC/format.c
trunk/OpenMPT/include/flac/src/libFLAC/include/private/all.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/bitmath.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/bitreader.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/bitwriter.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/cpu.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/crc.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/fixed.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/float.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/format.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/lpc.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/memory.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/metadata.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/stream_encoder_framing.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/window.h
trunk/OpenMPT/include/flac/src/libFLAC/include/protected/all.h
trunk/OpenMPT/include/flac/src/libFLAC/include/protected/stream_decoder.h
trunk/OpenMPT/include/flac/src/libFLAC/include/protected/stream_encoder.h
trunk/OpenMPT/include/flac/src/libFLAC/lpc.c
trunk/OpenMPT/include/flac/src/libFLAC/md5.c
trunk/OpenMPT/include/flac/src/libFLAC/memory.c
trunk/OpenMPT/include/flac/src/libFLAC/metadata_iterators.c
trunk/OpenMPT/include/flac/src/libFLAC/metadata_object.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_decoder.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_encoder.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_encoder_framing.c
trunk/OpenMPT/include/flac/src/libFLAC/window.c
trunk/OpenMPT/include/premake4.lua
Added Paths:
-----------
trunk/OpenMPT/include/flac/include/share/compat.h
trunk/OpenMPT/include/flac/include/share/endswap.h
trunk/OpenMPT/include/flac/include/share/macros.h
trunk/OpenMPT/include/flac/include/share/private.h
trunk/OpenMPT/include/flac/include/share/safe_str.h
trunk/OpenMPT/include/flac/include/share/win_utf8_io.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/macros.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/ogg_decoder_aspect.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/ogg_encoder_aspect.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/ogg_helper.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/ogg_mapping.h
trunk/OpenMPT/include/flac/src/libFLAC/ogg_decoder_aspect.c
trunk/OpenMPT/include/flac/src/libFLAC/ogg_encoder_aspect.c
trunk/OpenMPT/include/flac/src/libFLAC/ogg_helper.c
trunk/OpenMPT/include/flac/src/libFLAC/ogg_mapping.c
trunk/OpenMPT/include/flac/src/share/
trunk/OpenMPT/include/flac/src/share/win_utf8_io/
trunk/OpenMPT/include/flac/src/share/win_utf8_io/win_utf8_io.c
Removed Paths:
-------------
trunk/OpenMPT/include/flac/include/share/getopt.h
trunk/OpenMPT/include/flac/include/share/grabbag/
trunk/OpenMPT/include/flac/include/share/grabbag.h
trunk/OpenMPT/include/flac/include/share/replaygain_analysis.h
trunk/OpenMPT/include/flac/include/share/replaygain_synthesis.h
trunk/OpenMPT/include/flac/include/share/utf8.h
trunk/OpenMPT/include/flac/lib/
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_08.vcproj
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj.filters
Modified: trunk/OpenMPT/build/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/flac.vcproj 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/build/flac.vcproj 2013-11-25 13:39:38 UTC (rev 3307)
@@ -42,10 +42,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -121,10 +121,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -140,7 +140,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -199,10 +199,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334 /MP"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -218,7 +218,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -278,10 +278,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334 /MP"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -297,7 +297,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -356,10 +356,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -375,7 +375,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -435,10 +435,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
+ AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -454,7 +454,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.0\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
/>
<Tool
@@ -665,6 +665,20 @@
>
</File>
</Filter>
+ <Filter
+ Name="share"
+ Filter=""
+ >
+ <Filter
+ Name="win_utf8_io"
+ Filter=""
+ >
+ <File
+ RelativePath="..\include\flac\src\share\win_utf8_io\win_utf8_io.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Filter>
<Filter
Name="include"
Modified: trunk/OpenMPT/build/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/build/flac.vcxproj 2013-11-25 13:39:38 UTC (rev 3307)
@@ -111,10 +111,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -139,10 +139,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +153,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -167,10 +167,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -182,7 +182,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -198,10 +198,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -213,7 +213,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -229,10 +229,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -244,7 +244,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -259,10 +259,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
<ClCompile>
- <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -274,7 +274,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.0";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
@@ -351,6 +351,8 @@
</ClCompile>
<ClCompile Include="..\include\flac\src\libFLAC\window.c">
</ClCompile>
+ <ClCompile Include="..\include\flac\src\share\win_utf8_io\win_utf8_io.c">
+ </ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: trunk/OpenMPT/build/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-25 13:39:38 UTC (rev 3307)
@@ -2,32 +2,38 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{8D73C555-D4B8-2D41-AA64-549185F6A866}</UniqueIdentifier>
+ <UniqueIdentifier>{0992A517-1ED0-1B45-880B-3A82EEA4A4A2}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac">
- <UniqueIdentifier>{7DBFD967-716A-5D4C-ADB7-87AD1E067B04}</UniqueIdentifier>
+ <UniqueIdentifier>{D4E60470-34FE-F94C-8A10-CB91DBDB312F}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src">
- <UniqueIdentifier>{D7462892-CBBF-FF43-9AAB-B693D2FBDC29}</UniqueIdentifier>
+ <UniqueIdentifier>{F31D2B59-96A6-7847-8D52-B86738BC1A59}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC">
- <UniqueIdentifier>{EF8383C6-ED33-B646-902E-3CAC851D6EC9}</UniqueIdentifier>
+ <UniqueIdentifier>{608C6A5D-C1BB-EB41-B168-05585F6EB8E1}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include">
- <UniqueIdentifier>{81BF1A39-AD5A-8E42-AE15-62BE0CE41E4C}</UniqueIdentifier>
+ <UniqueIdentifier>{F9B48E83-5242-B448-86BD-1A29B723CA7B}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\private">
- <UniqueIdentifier>{FE262055-A0D1-3744-9497-258BCA1F6C01}</UniqueIdentifier>
+ <UniqueIdentifier>{1A2BD308-C89D-824C-BBB7-84667245054D}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\protected">
- <UniqueIdentifier>{FF7B7C17-1823-974C-89DA-FF2A5247C924}</UniqueIdentifier>
+ <UniqueIdentifier>{58211F3B-D7AA-034C-88C8-E7CD1F7BA1D4}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include">
- <UniqueIdentifier>{0990FB44-4019-D04E-BB03-72B126850B59}</UniqueIdentifier>
+ <UniqueIdentifier>{726F14E3-F58F-E447-A070-DA6719901549}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include\FLAC">
- <UniqueIdentifier>{1150D860-3747-1442-B79E-D73527226503}</UniqueIdentifier>
+ <UniqueIdentifier>{D815D0E7-B7EF-8049-825B-CEDE67038C4B}</UniqueIdentifier>
</Filter>
+ <Filter Include="include\flac\src\share">
+ <UniqueIdentifier>{A78D2877-81FA-4049-A0E8-01E67D8F97D9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="include\flac\src\share\win_utf8_io">
+ <UniqueIdentifier>{8F0EF0FC-28BD-4540-9114-266241FD1FE8}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\flac\src\libFLAC\include\private\all.h">
@@ -164,5 +170,8 @@
<ClCompile Include="..\include\flac\src\libFLAC\window.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
+ <ClCompile Include="..\include\flac\src\share\win_utf8_io\win_utf8_io.c">
+ <Filter>include\flac\src\share\win_utf8_io</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
Modified: trunk/OpenMPT/include/flac/AUTHORS
===================================================================
--- trunk/OpenMPT/include/flac/AUTHORS 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/AUTHORS 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,8 +1,9 @@
/* FLAC - Free Lossless Audio Codec
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2001-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
- * components distributed under difference licenses. The codec libraries
+ * components distributed under different licenses. The codec libraries
* are distributed under Xiph.Org's BSD-like license (see the file
* COPYING.Xiph in this distribution). All other programs, libraries, and
* plugins are distributed under the GPL (see COPYING.GPL). The documentation
Modified: trunk/OpenMPT/include/flac/COPYING.Xiph
===================================================================
--- trunk/OpenMPT/include/flac/COPYING.Xiph 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/COPYING.Xiph 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,4 +1,5 @@
-Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+Copyright (C) 2000-2009 Josh Coalson
+Copyright (C) 2011-2013 Xiph.Org Foundation
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Modified: trunk/OpenMPT/include/flac/README
===================================================================
--- trunk/OpenMPT/include/flac/README 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/README 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,8 +1,9 @@
/* FLAC - Free Lossless Audio Codec
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2001-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
- * components distributed under difference licenses. The codec libraries
+ * components distributed under different licenses. The codec libraries
* are distributed under Xiph.Org's BSD-like license (see the file
* COPYING.Xiph in this distribution). All other programs, libraries, and
* plugins are distributed under the LGPL or GPL (see COPYING.LGPL and
@@ -17,9 +18,12 @@
*/
-FLAC (http://flac.sourceforge.net/) is an Open Source lossless audio
-codec developed by Josh Coalson.
+FLAC is an Open Source lossless audio codec developed by Josh Coalson from 2001
+to 2009.
+From January 2012 FLAC is being maintained by Erik de Castro Lopo under the
+auspices of the Xiph.org Foundation.
+
FLAC is comprised of
* `libFLAC', a library which implements reference encoders and
decoders for native FLAC and Ogg FLAC, and a metadata interface
@@ -38,7 +42,7 @@
===============================================================================
-FLAC - 1.2.1 - Contents
+FLAC - 1.3.0 - Contents
===============================================================================
- Introduction
@@ -89,7 +93,7 @@
libFLAC has grown larger over time as more functionality has been
included, but much of it may be unnecessary for a particular embedded
implementation. Unused parts may be pruned by some simple editing of
-configure.in and src/libFLAC/Makefile.am; the following dependency
+configure.ac and src/libFLAC/Makefile.am; the following dependency
graph shows which modules may be pruned without breaking things
further down:
@@ -170,7 +174,7 @@
Use these if you have these packages but configure can't find them.
If you want to build completely from scratch (i.e. starting with just
-configure.in and Makefile.am) you should be able to just run 'autogen.sh'
+configure.ac and Makefile.am) you should be able to just run 'autogen.sh'
but make sure and read the comments in that file first.
@@ -200,55 +204,46 @@
Building with MSVC
===============================================================================
-There are .dsp projects and a master FLAC.dsw workspace to build all
-the libraries and executables with MSVC6. There are also .vcproj
-projects and a master FLAC.sln solution to build all the libraries and
-executables with VC++ 2005.
+There are .vcproj projects and a master FLAC.sln solution to build all
+the libraries and executables with MSVC 2005 or newer.
Prerequisite: you must have the Ogg libraries installed as described
later.
-Prerequisite: you must have nasm installed, and nasmw.exe must be in
-your PATH, or the path to nasmw.exe must be added to the list of
+Prerequisite: you must have nasm installed, and nasm.exe must be in
+your PATH, or the path to nasm.exe must be added to the list of
directories for executable files in the MSVC global options.
-MSVC6:
-To build everything, run Developer Studio, do File|Open Workspace,
-and open FLAC.dsw. Select "Build | Set active configuration..."
-from the menu, then in the dialog, select "All - Win32 Release" (or
-Debug if you prefer). Click "Ok" then hit F7 to build.
-
VC++ 2005:
To build everything, run Visual Studio, do File|Open and open FLAC.sln.
From the dropdown in the toolbar, select "Release" instead of "Debug",
then hit F7 to build.
-Either way, this will build all libraries both statically (e.g.
-obj\release\lib\libFLAC_static.lib) and as DLLs (e.g.
-obj\release\lib\libFLAC.dll), and it will build all binaries, statically
-linked (e.g. obj\release\bin\flac.exe).
+This will build all libraries both statically (e.g.
+objs\release\lib\libFLAC_static.lib) and as DLLs (e.g.
+objs\release\lib\libFLAC.dll), and it will build all binaries, statically
+linked (e.g. objs\release\bin\flac.exe).
-Everything will end up in the "obj" directory. DLLs and .exe files
+Everything will end up in the "objs" directory. DLLs and .exe files
are all that are needed and can be copied to an installation area and
-added to the PATH. The plugins have to be copied to their appropriate
-place in the player area. For Winamp2 this is <winamp2-dir>\Plugins.
+added to the PATH.
-By default the code is configured with Ogg support. Before building FLAC
+By default the code is configured with Ogg support. Before building FLAC
you will need to get the Ogg source distribution
-(see http://xiph.org/ogg/vorbis/download/), build ogg_static.lib (load and
-build win32\ogg_static.dsp), copy ogg_static.lib into FLAC's
-'obj\release\lib' directory, and copy the entire include\ogg tree into
-FLAC's 'include' directory (so that there is an 'ogg' directory in FLAC's
+(see http://xiph.org/downloads/), build libogg_static.lib (load
+win32\libogg_static.sln, change solution configuration to "Release" and
+code generation to "Multi-threaded (/MT)", then build), copy libogg_static.lib
+into FLAC's 'objs\release\lib' directory, and copy the entire include\ogg tree
+into FLAC's 'include' directory (so that there is an 'ogg' directory in FLAC's
'include' directory with the files ogg.h, os_types.h and config_types.h).
-If you want to build without Ogg support, instead edit all .dsp or
-.vcproj files and remove any occurrences of "/D FLAC__HAS_OGG".
+If you want to build without Ogg support, instead edit all .vcproj files
+and remove any "FLAC__HAS_OGG" definitions.
===============================================================================
Building on Mac OS X
===============================================================================
-If you have Fink or a recent version of OS X with the proper autotooles,
-the GNU flow above should work. The Project Builder project has been
-deprecated but we are working on replacing it with an Xcode equivalent.
+If you have Fink or a recent version of OS X with the proper autotools,
+the GNU flow above should work.
Modified: trunk/OpenMPT/include/flac/include/FLAC/all.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/all.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/all.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -161,7 +162,7 @@
* in FLAC 1.1.3 is a set of \c #defines in \c export.h of each
* library's includes (e.g. \c include/FLAC/export.h). The
* \c #defines mirror the libraries'
- * <A HREF="http://www.gnu.org/software/libtool/manual.html#Libtool-versioning">libtool version numbers</A>,
+ * <A HREF="http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning">libtool version numbers</A>,
* e.g. in libFLAC there are \c FLAC_API_VERSION_CURRENT,
* \c FLAC_API_VERSION_REVISION, and \c FLAC_API_VERSION_AGE.
* These can be used to support multiple versions of an API during the
Modified: trunk/OpenMPT/include/flac/include/FLAC/assert.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/assert.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/assert.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2001-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/OpenMPT/include/flac/include/FLAC/callback.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/callback.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/callback.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2004-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/OpenMPT/include/flac/include/FLAC/export.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/export.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/export.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,25 +56,30 @@
* \{
*/
-#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
+#if defined(FLAC__NO_DLL)
#define FLAC_API
-#else
-
+#elif defined(_MSC_VER)
#ifdef FLAC_API_EXPORTS
#define FLAC_API _declspec(dllexport)
#else
#define FLAC_API _declspec(dllimport)
+#endif
+#elif defined(FLAC__USE_VISIBILITY_ATTR)
+#define FLAC_API __attribute__ ((visibility ("default")))
+
+#else
+#define FLAC_API
+
#endif
-#endif
/** These #defines will mirror the libtool-based library version number, see
- * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning
+ * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
*/
-#define FLAC_API_VERSION_CURRENT 10
+#define FLAC_API_VERSION_CURRENT 11
#define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 2 /**< see above */
+#define FLAC_API_VERSION_AGE 3 /**< see above */
#ifdef __cplusplus
extern "C" {
Modified: trunk/OpenMPT/include/flac/include/FLAC/format.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/format.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/format.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -879,6 +880,18 @@
*/
FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
+/** Tests that a blocksize at the given sample rate is valid for the FLAC
+ * subset.
+ *
+ * \param blocksize The blocksize to test for compliance.
+ * \param sample_rate The sample rate is needed, since the valid subset
+ * blocksize depends on the sample rate.
+ * \retval FLAC__bool
+ * \c true if the given blocksize conforms to the specification for the
+ * subset at the given sample rate, else \c false.
+ */
+FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigned sample_rate);
+
/** Tests that a sample rate is valid for the FLAC subset. The subset rules
* for valid sample rates are slightly more complex since the rate has to
* be expressible completely in the frame header.
Modified: trunk/OpenMPT/include/flac/include/FLAC/metadata.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/metadata.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/metadata.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2001-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -1986,7 +1987,7 @@
* \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
* \code track_num < object->data.cue_sheet.num_tracks \endcode
* \code (track->indices != NULL && track->num_indices > 0) ||
- * (track->indices == NULL && track->num_indices == 0)
+ * (track->indices == NULL && track->num_indices == 0) \endcode
* \retval FLAC__bool
* \c false if \a copy is \c true and malloc() fails, else \c true.
*/
Modified: trunk/OpenMPT/include/flac/include/FLAC/ordinals.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/ordinals.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/ordinals.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,40 +33,45 @@
#ifndef FLAC__ORDINALS_H
#define FLAC__ORDINALS_H
-#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__))
-#include <inttypes.h>
-#endif
+#if defined(_MSC_VER) && _MSC_VER < 1600
-typedef signed char FLAC__int8;
-typedef unsigned char FLAC__uint8;
+/* Microsoft Visual Studio earlier than the 2010 version did not provide
+ * the 1999 ISO C Standard header file <stdint.h>.
+ */
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef __int8 FLAC__int8;
+typedef unsigned __int8 FLAC__uint8;
+
typedef __int16 FLAC__int16;
typedef __int32 FLAC__int32;
typedef __int64 FLAC__int64;
typedef unsigned __int16 FLAC__uint16;
typedef unsigned __int32 FLAC__uint32;
typedef unsigned __int64 FLAC__uint64;
-#elif defined(__EMX__)
-typedef short FLAC__int16;
-typedef long FLAC__int32;
-typedef long long FLAC__int64;
-typedef unsigned short FLAC__uint16;
-typedef unsigned long FLAC__uint32;
-typedef unsigned long long FLAC__uint64;
+
#else
+
+/* For MSVC 2010 and everything else which provides <stdint.h>. */
+
+#include <stdint.h>
+
+typedef int8_t FLAC__int8;
+typedef uint8_t FLAC__uint8;
+
typedef int16_t FLAC__int16;
typedef int32_t FLAC__int32;
typedef int64_t FLAC__int64;
typedef uint16_t FLAC__uint16;
typedef uint32_t FLAC__uint32;
typedef uint64_t FLAC__uint64;
+
#endif
typedef int FLAC__bool;
typedef FLAC__uint8 FLAC__byte;
+
#ifdef true
#undef true
#endif
Modified: trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/OpenMPT/include/flac/include/FLAC/stream_encoder.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/stream_encoder.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/FLAC/stream_encoder.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -128,7 +129,7 @@
* Unlike the decoders, the stream encoder has many options that can
* affect the speed and compression ratio. When setting these parameters
* you should have some basic knowledge of the format (see the
- * <A HREF="../documentation.html#format">user-level documentation</A>
+ * <A HREF="../documentation_format_overview.html">user-level documentation</A>
* or the <A HREF="../format.html">formal description</A>). The
* FLAC__stream_encoder_set_*() functions themselves do not validate the
* values as many are interdependent. The FLAC__stream_encoder_init_*()
Modified: trunk/OpenMPT/include/flac/include/share/alloc.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/alloc.h 2013-11-24 23:33:26 UTC (rev 3306)
+++ trunk/OpenMPT/include/flac/include/share/alloc.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -1,19 +1,33 @@
/* alloc - Convenience routines for safely allocating memory
- * Copyright (C) 2007 Josh Coalson
+ * Copyright (C) 2007-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef FLAC__SHARE__ALLOC_H
@@ -28,15 +42,20 @@
*/
#include <limits.h> /* for SIZE_MAX */
-#if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
+#if HAVE_STDINT_H
#include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
#endif
#include <stdlib.h> /* for size_t, malloc(), etc */
+#include "share/compat.h"
#ifndef SIZE_MAX
# ifndef SIZE_T_MAX
# ifdef _MSC_VER
-# define SIZE_T_MAX UINT_MAX
+# ifdef _WIN64
+# define SIZE_T_MAX 0xffffffffffffffffui64
+# else
+# define SIZE_T_MAX 0xffffffff
+# endif
# else
# error
# endif
@@ -44,14 +63,10 @@
# define SIZE_MAX SIZE_T_MAX
#endif
-#ifndef FLaC__INLINE
-#define FLaC__INLINE
-#endif
-
/* avoid malloc()ing 0 bytes, see:
* https://www.securecoding.cert.org/confluence/display/seccode/MEM04-A.+Do+not+make+assumptions+about+the+result+of+allocating+0+bytes?focusedCommentId=5407003
*/
-static FLaC__INLINE void *safe_malloc_(size_t size)
+static inline void *safe_malloc_(size_t size)
{
/* malloc(0) is undefined; FLAC src convention is to always allocate */
if(!size)
@@ -59,7 +74,7 @@
return malloc(size);
}
-static FLaC__INLINE void *safe_calloc_(size_t nmemb, size_t size)
+static inline void *safe_calloc_(size_t nmemb, size_t size)
{
if(!nmemb || !size)
return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
@@ -68,7 +83,7 @@
/*@@@@ there's probably a better way to prevent overflows when allocating untrusted sums but this works for now */
-static FLaC__INLINE void *safe_malloc_add_2op_(size_t size1, size_t size2)
+static inline void *safe_malloc_add_2op_(size_t size1, size_t size2)
{
size2 += size1;
if(size2 < size1)
@@ -76,7 +91,7 @@
return safe_malloc_(size2);
}
-static FLaC__INLINE void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3)
{
size2 += size1;
if(size2 < size1)
@@ -87,7 +102,7 @@
return safe_malloc_(size3);
}
-static FLaC__INLINE void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4)
+static inline void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4)
{
size2 += size1;
if(size2 < size1)
@@ -101,29 +116,9 @@
return safe_malloc_(size4);
}
-static FLaC__INLINE void *safe_malloc_mul_2op_(size_t size1, size_t size2)
-#if 0
-needs support for cases where sizeof(size_t) != 4
-{
- /* could be faster #ifdef'ing off SIZEOF_SIZE_T */
- if(sizeof(size_t) == 4) {
- if ((double)size1 * (double)size2 < 4294967296.0)
- return malloc(size1*size2);
- }
- return 0;
-}
-#else
-/* better? */
-{
- if(!size1 || !size2)
- return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
- if(size1 > SIZE_MAX / size2)
- return 0;
- return malloc(size1*size2);
-}
-#endif
+void *safe_malloc_mul_2op_(size_t size1, size_t size2) ;
-static FLaC__INLINE void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3)
{
if(!size1 || !size2 || !size3)
return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
@@ -136,7 +131,7 @@
}
/* size1*size2 + size3 */
-static FLaC__INLINE void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3)
{
if(!size1 || !size2)
return safe_malloc_(size3);
@@ -146,17 +141,19 @@
}
/* size1 * (size2 + size3) */
-static FLaC__INLINE void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3)
{
if(!size1 || (!size2 && !size3))
return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
size2 += size3;
if(size2 < size3)
return 0;
- return safe_malloc_mul_2op_(size1, size2);
+ if(size1 > SIZE_MAX / size2)
+ return 0;
+ return malloc(size1*size2);
}
-static FLaC__INLINE void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2)
+static inline void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2)
{
size2 += size1;
if(size2 < size1)
@@ -164,7 +161,7 @@
return realloc(ptr, size2);
}
-static FLaC__INLINE void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3)
+static inline void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3)
{
size2 += size1;
if(size2 < size1)
@@ -175,7 +172,7 @@
return realloc(ptr, size3);
}
-static FLaC__INLINE void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4)
+static inline void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4)
{
size2 += size1;
if(size2 < size1)
@@ -189,7 +186,7 @@
return realloc(ptr, size4);
}
-static FLaC__INLINE void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2)
+static inline void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2)
{
if(!size1 || !size2)
return realloc(ptr, 0); /* preserve POSIX realloc(ptr, 0) semantics */
@@ -199,7 +196,7 @@
}
/* size1 * (size2 + size3) */
-static FLaC__INLINE void *safe_realloc_muladd2_(void *ptr, size_t size1, size_t size2, size_t size3)
+static inline void *safe_realloc_muladd2_(void *ptr, size_t size1, size_t size2, size_t size3)
{
if(!size1 || (!size2 && !size3))
return realloc(ptr, 0); /* preserve POSIX realloc(ptr, 0) semantics */
Added: trunk/OpenMPT/include/flac/include/share/compat.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/compat.h (rev 0)
+++ trunk/OpenMPT/include/flac/include/share/compat.h 2013-11-25 13:39:38 UTC (rev 3307)
@@ -0,0 +1,196 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2012 Xiph.org Foundation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* This is the prefered location of all CPP hackery to make $random_compiler
+ * work like something approaching a C99 (or maybe more accurately GNU99)
+ * compiler.
+ *
+ * It is assumed that this header will be included after "config.h".
+ */
+
+#ifndef FLAC__SHARE__COMPAT_H
+#define FLAC__SHARE__COMPAT_H
+
+#if defined _WIN32 && !defined __CYGWIN__
+/* where MSVC puts unlink() */
+# include <io.h>
+#else
+# include <unistd.h>
+#endif
+
+#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
+#include <sys/types.h> /* for off_t */
+#define FLAC__off_t __int64 /* use this instead of off_t to fix the 2 GB limit */
+#if !defined __MINGW32__
+#define fseeko _fseeki64
+#define ftello _ftelli64
+#else /* MinGW */
+#if !defined(HAVE_FSEEKO)
+#define fseeko fseeko64
+#define ftello ftello64
+#endif
+#endif
+#else
+#define FLAC__off_t off_t
+#endif
+
+#if HAVE_INTTYPES_H
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#endif
+
+#if defined(_MSC_VER)
+#define strtoll _strtoi64
+#define strtoull _strtoui64
+#endif
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1500
+/* Visual Studio 2008 has restrict. */
+#define restrict __restrict
+#endif
+#define inline __inline
+#endif
+
+/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
+#ifdef _MSC_VER
+#define FLAC__U64L(x) x
+#else
+#define FLAC__U64L(x) x##LLU
+#endif
+
+#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
+#define FLAC__STRNCASECMP strnicmp
+#else
+#define FLAC__STRNCASECMP strncasecmp
+#endif
+
+#if defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ || defined __EMX__
+#include <io.h> /* for _setmode(), chmod() */
+#include <fcntl.h> /* for _O_BINARY */
+#else
+#include <unistd.h> /* for chown(), unlink() */
+#endif
+
+#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
+#if defined __BORLANDC__
+#include <utime.h> /* for utime() */
+#else
+#include <sys/utime.h> /* for utime() */
+#endif
+#else
+#include <sys/types.h> /* some flavors of BSD (like OS X) require this to get time_t */
+#include <utime.h> /* for utime() */
+#endif
+
+#if defined _MSC_VER
+# if _MSC_VER >= 1600
+/* Visual Studio 2010 has decent C99 support */
+# include <stdint.h>
+# define PRIu64 "llu"
+# define PRId64 "lld"
+# define PRIx64 "llx"
+# else
+# include <limits.h>
+# ifndef UINT32_MAX
+# define UINT32_MAX _UI32_MAX
+# endif
+ typedef unsigned __int64 uint64_t;
+ typedef unsigned __int32 uint32_t;
+ typedef unsigned __int16 uint16_t;
+ typedef unsigned __int8 uint8_t;
+ typedef __int64 int64_t;
+ typedef __int32 int32_t;
+ typedef __int16 int16_t;
+ typedef __int8 int8_t;
+# define PRIu64 "I64u"
+# define PRId64 "I64d"
+# define PRIx64 "I64x"
+# endif
+#endif /* defined _MSC_VER */
+
+#ifdef _WIN32
+/* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */
+#include "share/win_utf8_io.h"
+
+#define flac_printf printf_utf8
+#define flac_fprintf fprintf_utf8
+#define flac_vfprintf vfprintf_utf8
+#define flac_fopen fopen_utf8
+#define flac_chmod chmod_utf8
+#define flac_utime utime_utf8
+#define flac_unlink unlink_utf8
+#define flac_rename rename_utf8
+#defin...
[truncated message content] |
