Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4610] trunk/OpenMPT
|
From: <man...@us...> - 2014-11-28 17:19:57
|
Revision: 4610
http://sourceforge.net/p/modplug/code/4610
Author: manxorist
Date: 2014-11-28 17:19:35 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
[Var] Update FLAC to v1.3.1 .
Modified Paths:
--------------
trunk/OpenMPT/build/gen/flac.vcproj
trunk/OpenMPT/build/gen/flac.vcxproj
trunk/OpenMPT/build/gen/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/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/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/macros.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/md5.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/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/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/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/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/flac/src/share/win_utf8_io/win_utf8_io.c
trunk/OpenMPT/include/flac.premake4.lua
Added Paths:
-----------
trunk/OpenMPT/include/flac/src/libFLAC/fixed_intrin_sse2.c
trunk/OpenMPT/include/flac/src/libFLAC/fixed_intrin_ssse3.c
trunk/OpenMPT/include/flac/src/libFLAC/ia32/
trunk/OpenMPT/include/flac/src/libFLAC/ia32/cpu_asm.nasm
trunk/OpenMPT/include/flac/src/libFLAC/ia32/fixed_asm.nasm
trunk/OpenMPT/include/flac/src/libFLAC/ia32/lpc_asm.nasm
trunk/OpenMPT/include/flac/src/libFLAC/ia32/nasm.h
trunk/OpenMPT/include/flac/src/libFLAC/include/private/stream_encoder.h
trunk/OpenMPT/include/flac/src/libFLAC/lpc_intrin_avx2.c
trunk/OpenMPT/include/flac/src/libFLAC/lpc_intrin_sse.c
trunk/OpenMPT/include/flac/src/libFLAC/lpc_intrin_sse2.c
trunk/OpenMPT/include/flac/src/libFLAC/lpc_intrin_sse41.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_encoder_intrin_avx2.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_encoder_intrin_sse2.c
trunk/OpenMPT/include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c
Modified: trunk/OpenMPT/build/gen/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/gen/flac.vcproj 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/build/gen/flac.vcproj 2014-11-28 17:19:35 UTC (rev 4610)
@@ -45,7 +45,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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
@@ -124,7 +124,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -140,7 +140,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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
@@ -202,7 +202,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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.3.0\";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.1\";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
@@ -281,7 +281,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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.3.0\";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.1\";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
@@ -359,7 +359,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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.3.0\";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.1\";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
@@ -438,7 +438,7 @@
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- 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="FLAC__NO_DLL;VERSION=\"1.3.1\";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.3.0\";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.1\";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
@@ -570,6 +570,10 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\include\private\stream_encoder_framing.h"
>
</File>
@@ -621,6 +625,14 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\fixed_intrin_sse2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\fixed_intrin_ssse3.c"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\float.c"
>
</File>
@@ -633,6 +645,22 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\lpc_intrin_avx2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\lpc_intrin_sse2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\lpc_intrin_sse41.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\lpc_intrin_sse.c"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\md5.c"
>
</File>
@@ -657,6 +685,18 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\stream_encoder_intrin_avx2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\stream_encoder_intrin_sse2.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\stream_encoder_intrin_ssse3.c"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\stream_encoder_framing.c"
>
</File>
Modified: trunk/OpenMPT/build/gen/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/gen/flac.vcxproj 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/build/gen/flac.vcxproj 2014-11-28 17:19:35 UTC (rev 4610)
@@ -114,7 +114,7 @@
<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.3.0";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.1";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>MultiThreadedDebug</RuntimeLibrary>
@@ -125,7 +125,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <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>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";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>
@@ -142,7 +142,7 @@
<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.3.0";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.1";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>MultiThreadedDebug</RuntimeLibrary>
@@ -153,7 +153,7 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <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>
+ <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";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>
@@ -170,7 +170,7 @@
<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.3.0";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.1";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.3.0";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.1";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>
@@ -201,7 +201,7 @@
<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.3.0";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.1";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.3.0";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.1";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>
@@ -232,7 +232,7 @@
<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.3.0";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.1";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.3.0";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.1";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>
@@ -262,7 +262,7 @@
<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.3.0";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.1";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.3.0";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.1";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>
@@ -301,6 +301,7 @@
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\md5.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\memory.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\metadata.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder_framing.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\window.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\protected\all.h" />
@@ -329,12 +330,24 @@
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\fixed.c">
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\fixed_intrin_sse2.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\fixed_intrin_ssse3.c">
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\float.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\format.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\lpc.c">
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_avx2.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse2.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse41.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse.c">
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\md5.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\memory.c">
@@ -347,6 +360,12 @@
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder.c">
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_avx2.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_sse2.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_ssse3.c">
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_framing.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\window.c">
Modified: trunk/OpenMPT/build/gen/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/gen/flac.vcxproj.filters 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/build/gen/flac.vcxproj.filters 2014-11-28 17:19:35 UTC (rev 4610)
@@ -2,37 +2,37 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{B7001649-E6CA-EC40-B7E5-19B0A790498D}</UniqueIdentifier>
+ <UniqueIdentifier>{DBBF01E4-2752-914D-B523-37BC4141C557}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac">
- <UniqueIdentifier>{2D5C8B77-DA1B-8641-9D6A-0694FBBAFAE0}</UniqueIdentifier>
+ <UniqueIdentifier>{12618FA6-0897-9443-87A7-B1FCF5E3CFDB}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src">
- <UniqueIdentifier>{0E1A5C5B-57D3-8C41-8897-1A81CA416761}</UniqueIdentifier>
+ <UniqueIdentifier>{A3029C73-04B7-BC4F-884F-C49387619902}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC">
- <UniqueIdentifier>{AA84FF48-7868-9C4C-A69B-BD8F82907385}</UniqueIdentifier>
+ <UniqueIdentifier>{E7CCF378-9A55-064D-8944-ECA731C1A85D}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include">
- <UniqueIdentifier>{3233DEE2-52D3-8849-BCD1-71F195EA353B}</UniqueIdentifier>
+ <UniqueIdentifier>{3BEE864C-0550-4742-BFE2-455AF29F7508}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\private">
- <UniqueIdentifier>{018C5592-1164-ED4E-B88F-D84B74F76032}</UniqueIdentifier>
+ <UniqueIdentifier>{250AEE6E-8367-244B-AD10-53AA7E28A0DF}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\protected">
- <UniqueIdentifier>{BF28CD32-4AEA-5A44-8459-0121F306AD4A}</UniqueIdentifier>
+ <UniqueIdentifier>{EBB59549-AC23-594F-A7EC-67FB1DEE6F18}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include">
- <UniqueIdentifier>{C3075182-D8D9-6D4A-AC86-765B62BFF004}</UniqueIdentifier>
+ <UniqueIdentifier>{5AE8ED7A-8516-3E43-89BF-7EBAA82D8DF3}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include\FLAC">
- <UniqueIdentifier>{1A8CED26-238F-DB42-9890-043B71968D33}</UniqueIdentifier>
+ <UniqueIdentifier>{986FEA12-4E26-6545-BEF2-5D113998E167}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share">
- <UniqueIdentifier>{3F8A36E1-642E-8441-A1C4-97D268C871CB}</UniqueIdentifier>
+ <UniqueIdentifier>{7896B2AA-F5A0-964F-B58D-C7239691BEF8}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share\win_utf8_io">
- <UniqueIdentifier>{2D0A81D5-142A-A64A-861F-3E01CF7ADFC1}</UniqueIdentifier>
+ <UniqueIdentifier>{C9E9DF11-E837-8141-BF5D-18C634F0241A}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@@ -75,6 +75,9 @@
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\metadata.h">
<Filter>include\flac\src\libFLAC\include\private</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h">
+ <Filter>include\flac\src\libFLAC\include\private</Filter>
+ </ClInclude>
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder_framing.h">
<Filter>include\flac\src\libFLAC\include\private</Filter>
</ClInclude>
@@ -137,6 +140,12 @@
<ClCompile Include="..\..\include\flac\src\libFLAC\fixed.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\fixed_intrin_sse2.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\fixed_intrin_ssse3.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\float.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
@@ -146,6 +155,18 @@
<ClCompile Include="..\..\include\flac\src\libFLAC\lpc.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_avx2.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse2.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse41.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\lpc_intrin_sse.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\md5.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
@@ -164,6 +185,15 @@
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_avx2.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_sse2.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_intrin_ssse3.c">
+ <Filter>include\flac\src\libFLAC</Filter>
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder_framing.c">
<Filter>include\flac\src\libFLAC</Filter>
</ClCompile>
Modified: trunk/OpenMPT/include/flac/AUTHORS
===================================================================
--- trunk/OpenMPT/include/flac/AUTHORS 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/AUTHORS 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* FLAC - Free Lossless Audio Codec
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
* components distributed under different licenses. The codec libraries
@@ -17,11 +17,27 @@
* distribution.
*/
+Current FLAC maintainer: Erik de Castro Lopo <er...@me...>
-FLAC (http://flac.sourceforge.net/) is an Open Source lossless audio
-codec developed by Josh Coalson <jco...@us...>.
+Original author: Josh Coalson <jco...@us...>
+Website : https://www.xiph.org/flac/
+
+FLAC is an Open Source lossless audio codec originally developed by Josh Coalson
+between 2001 and 2009. From 2009 to 2012 FLAC was basically unmaintained. In
+2012 the Erik de Castro Lopo became the chief maintainer as part of the
+Xiph.Org Foundation.
+
Other major contributors and their contributions:
+
+"lvqcl" <lv...@us...>
+* Visual Studio build system.
+* Optimisations in the encoder and decoder.
+
+"Janne Hyvärinen" <cs...@sc...>
+* Visual Studio build system.
+* Unicode handling on Windows.
+
"Andrey Astafiev" <an...@tv...>
* Russian translation of the HTML documentation
Modified: trunk/OpenMPT/include/flac/COPYING.Xiph
===================================================================
--- trunk/OpenMPT/include/flac/COPYING.Xiph 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/COPYING.Xiph 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
Copyright (C) 2000-2009 Josh Coalson
-Copyright (C) 2011-2013 Xiph.Org Foundation
+Copyright (C) 2011-2014 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 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/README 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* FLAC - Free Lossless Audio Codec
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* This file is part the FLAC project. FLAC is comprised of several
* components distributed under different licenses. The codec libraries
@@ -31,7 +31,7 @@
* `flac', a command-line program for encoding and decoding files
* `metaflac', a command-line program for viewing and editing FLAC
metadata
- * player plugins for XMMS and Winamp
+ * player plugin for XMMS
* user and API documentation
The libraries (libFLAC, libFLAC++) are
@@ -42,7 +42,7 @@
===============================================================================
-FLAC - 1.3.0 - Contents
+FLAC - 1.3.1 - Contents
===============================================================================
- Introduction
@@ -67,12 +67,18 @@
A brief description of the directory tree:
doc/ the HTML documentation
+ examples/ example programs demonstrating the use of libFLAC and libFLAC++
include/ public include files for libFLAC and libFLAC++
- man/ the man page for `flac'
+ man/ the man pages for `flac' and `metaflac'
src/ the source code and private headers
test/ the test scripts
+If you have questions about building FLAC that this document does not answer,
+please submit them at the following tracker so this document can be improved:
+ https://sourceforge.net/p/flac/support-requests/
+
+
===============================================================================
Prerequisites
===============================================================================
@@ -152,7 +158,7 @@
assembly routines. Many routines have assembly versions for
speed and `configure' is pretty good about knowing what is
supported, but you can use this option to build only from the
-C sources. May be necessary for building on OS X (Intel)
+C sources. May be necessary for building on OS X (Intel).
--enable-sse : If you are building for an x86 CPU that supports
SSE instructions, you can enable some of the faster routines
@@ -214,10 +220,9 @@
your PATH, or the path to nasm.exe must be added to the list of
directories for executable files in the MSVC global options.
-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.
+then do Build|Build Solution.
This will build all libraries both statically (e.g.
objs\release\lib\libFLAC_static.lib) and as DLLs (e.g.
Modified: trunk/OpenMPT/include/flac/include/FLAC/all.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/all.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/all.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 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/assert.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/assert.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/assert.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 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 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/callback.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2004-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 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 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/export.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -61,9 +61,9 @@
#elif defined(_MSC_VER)
#ifdef FLAC_API_EXPORTS
-#define FLAC_API _declspec(dllexport)
+#define FLAC_API __declspec(dllexport)
#else
-#define FLAC_API _declspec(dllimport)
+#define FLAC_API __declspec(dllimport)
#endif
#elif defined(FLAC__USE_VISIBILITY_ATTR)
Modified: trunk/OpenMPT/include/flac/include/FLAC/format.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/format.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/format.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -509,9 +509,11 @@
FLAC__METADATA_TYPE_PICTURE = 6,
/**< <A HREF="../format.html#metadata_block_picture">PICTURE</A> block */
- FLAC__METADATA_TYPE_UNDEFINED = 7
+ FLAC__METADATA_TYPE_UNDEFINED = 7,
/**< marker to denote beginning of undefined type range; this number will increase as new metadata types are added */
+ FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE,
+ /**< No type will ever be greater than this. There is not enough room in the protocol block. */
} FLAC__MetadataType;
/** Maps a FLAC__MetadataType to a C string.
Modified: trunk/OpenMPT/include/flac/include/FLAC/metadata.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/metadata.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/metadata.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -500,7 +500,7 @@
* \retval unsigned
* The length of the metadata block at the current iterator position.
* The is same length as that in the
- * <a href="http://flac.sourceforge.net/format.html#metadata_block_header">metadata block header</a>,
+ * <a href="http://xiph.org/flac/format.html#metadata_block_header">metadata block header</a>,
* i.e. the length of the metadata body that follows the header.
*/
FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator);
Modified: trunk/OpenMPT/include/flac/include/FLAC/ordinals.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/ordinals.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/ordinals.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 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_decoder.h
===================================================================
--- trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/stream_decoder.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 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 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/FLAC/stream_encoder.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2000-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -830,28 +830,28 @@
* The actual values set for each level are:
* <table>
* <tr>
- * <td><b>level</b><td>
- * <td>do mid-side stereo<td>
- * <td>loose mid-side stereo<td>
- * <td>apodization<td>
- * <td>max lpc order<td>
- * <td>qlp coeff precision<td>
- * <td>qlp coeff prec search<td>
- * <td>escape coding<td>
- * <td>exhaustive model search<td>
- * <td>min residual partition order<td>
- * <td>max residual partition order<td>
- * <td>rice parameter search dist<td>
+ * <td><b>level</b></td>
+ * <td>do mid-side stereo</td>
+ * <td>loose mid-side stereo</td>
+ * <td>apodization</td>
+ * <td>max lpc order</td>
+ * <td>qlp coeff precision</td>
+ * <td>qlp coeff prec search</td>
+ * <td>escape coding</td>
+ * <td>exhaustive model search</td>
+ * <td>min residual partition order</td>
+ * <td>max residual partition order</td>
+ * <td>rice parameter search dist</td>
* </tr>
- * <tr> <td><b>0</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
- * <tr> <td><b>1</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
- * <tr> <td><b>2</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>0<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>3<td> <td>0<td> </tr>
- * <tr> <td><b>3</b><td> <td>false<td> <td>false<td> <td>tukey(0.5)<td> <td>6<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>4<td> <td>0<td> </tr>
- * <tr> <td><b>4</b><td> <td>true<td> <td>true<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>4<td> <td>0<td> </tr>
- * <tr> <td><b>5</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>5<td> <td>0<td> </tr>
- * <tr> <td><b>6</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>false<td> <td>0<td> <td>6<td> <td>0<td> </tr>
- * <tr> <td><b>7</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>8<td> <td>0<td> <td>false<td> <td>false<td> <td>true<td> <td>0<td> <td>6<td> <td>0<td> </tr>
- * <tr> <td><b>8</b><td> <td>true<td> <td>false<td> <td>tukey(0.5)<td> <td>12<td> <td>0<td> <td>false<td> <td>false<td> <td>true<td> <td>0<td> <td>6<td> <td>0<td> </tr>
+ * <tr> <td><b>0</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
+ * <tr> <td><b>1</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
+ * <tr> <td><b>2</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
+ * <tr> <td><b>3</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)<td> <td>6</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
+ * <tr> <td><b>4</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
+ * <tr> <td><b>5</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>5</td> <td>0</td> </tr>
+ * <tr> <td><b>6</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
+ * <tr> <td><b>7</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2)<td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
+ * <tr> <td><b>8</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2);punchout_tukey(3)</td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
* </table>
*
* \default \c 5
@@ -920,7 +920,8 @@
* The available functions are \c bartlett, \c bartlett_hann,
* \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop,
* \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall,
- * \c rectangle, \c triangle, \c tukey(P), \c welch.
+ * \c rectangle, \c triangle, \c tukey(P), \c partial_tukey(n[/ov[/P]]),
+ * \c punchout_tukey(n[/ov[/P]]), \c welch.
*
* For \c gauss(STDDEV), STDDEV specifies the standard deviation
* (0<STDDEV<=0.5).
@@ -929,6 +930,24 @@
* tapered (0<=P<=1). P=0 corresponds to \c rectangle and P=1
* corresponds to \c hann.
*
+ * Specifying \c partial_tukey or \c punchout_tukey works a little
+ * different. These do not specify a single apodization function, but
+ * a series of them with some overlap. partial_tukey specifies a series
+ * of small windows (all treated separately) while punchout_tukey
+ * specifies a series of windows that have a hole in them. In this way,
+ * the predictor is constructed with only a part of the block, which
+ * helps in case a block consists of dissimilar parts.
+ *
+ * The three parameters that can be specified for the functions are
+ * n, ov and P. n is the number of functions to add, ov is the overlap
+ * of the windows in case of partial_tukey and the overlap in the gaps
+ * in case of punchout_tukey. P is the fraction of the window that is
+ * tapered, like with a regular tukey window. The function can be
+ * specified with only a number, a number and an overlap, or a number
+ * an overlap and a P, for example, partial_tukey(3), partial_tukey(3/0.3)
+ * and partial_tukey(3/0.3/0.5) are all valid. ov should be smaller than 1
+ * and can be negative.
+ *
* Example specifications are \c "blackman" or
* \c "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"
*
@@ -941,7 +960,9 @@
* results in the smallest compressed subframe.
*
* Note that each function specified causes the encoder to occupy a
- * floating point array in which to store the window.
+ * floating point array in which to store the window. Also note that the
+ * values of P, STDDEV and ov are locale-specific, so if the comma
+ * separator specified by the locale is a comma, a comma should be used.
*
* \default \c "tukey(0.5)"
* \param encoder An encoder instance to set.
Modified: trunk/OpenMPT/include/flac/include/share/alloc.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/alloc.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/alloc.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* alloc - Convenience routines for safely allocating memory
* Copyright (C) 2007-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,7 +33,7 @@
#ifndef FLAC__SHARE__ALLOC_H
#define FLAC__SHARE__ALLOC_H
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
Modified: trunk/OpenMPT/include/flac/include/share/compat.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/compat.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/compat.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2012 Xiph.org Foundation
+ * Copyright (C) 2012-2014 Xiph.org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -73,23 +73,25 @@
#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
+#if defined __INTEL_COMPILER || (defined _MSC_VER && defined _WIN64)
+/* MSVS generates VERY slow 32-bit code with __restrict */
+#define flac_restrict __restrict
+#elif defined __GNUC__
+#define flac_restrict __restrict__
#else
-#define FLAC__U64L(x) x##LLU
+#define flac_restrict
#endif
+#define FLAC__U64L(x) x##ULL
+
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
+#define FLAC__STRCASECMP stricmp
#define FLAC__STRNCASECMP strnicmp
#else
+#define FLAC__STRCASECMP strcasecmp
#define FLAC__STRNCASECMP strncasecmp
#endif
@@ -161,12 +163,7 @@
#define flac_utime utime
#define flac_unlink unlink
#define flac_rename rename
-
-#ifdef _WIN32
-#define flac_stat _stat64
-#else
#define flac_stat stat
-#endif
#endif
@@ -178,17 +175,25 @@
#define flac_fstat fstat
#endif
+#ifndef M_LN2
+#define M_LN2 0.69314718055994530942
+#endif
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
-/* FLAC needs to compile and work correctly on systems with a norrmal ISO C99
+/* FLAC needs to compile and work correctly on systems with a normal ISO C99
* snprintf as well as Microsoft Visual Studio which has an non-standards
* conformant snprint_s function.
*
* This function wraps the MS version to behave more like the the ISO version.
*/
+#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif
int flac_snprintf(char *str, size_t size, const char *fmt, ...);
+int flac_vsnprintf(char *str, size_t size, const char *fmt, va_list va);
#ifdef __cplusplus
};
#endif
Modified: trunk/OpenMPT/include/flac/include/share/endswap.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/endswap.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/endswap.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2012 Xiph.org Foundation
+ * Copyright (C) 2012-2014 Xiph.org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,21 +33,46 @@
#if HAVE_BSWAP32 /* GCC and Clang */
+/* GCC prior to 4.8 didn't provide bswap16 on x86_64 */
+#if ! HAVE_BSWAP16
+static inline unsigned short __builtin_bswap16(unsigned short a)
+{
+ return (a<<8)|(a>>8);
+}
+#endif
+
+#define ENDSWAP_16(x) (__builtin_bswap16 (x))
#define ENDSWAP_32(x) (__builtin_bswap32 (x))
#elif defined _MSC_VER /* Windows. Apparently in <stdlib.h>. */
+#define ENDSWAP_16(x) (_byteswap_ushort (x))
#define ENDSWAP_32(x) (_byteswap_ulong (x))
#elif defined HAVE_BYTESWAP_H /* Linux */
#include <byteswap.h>
+#define ENDSWAP_16(x) (bswap_16 (x))
#define ENDSWAP_32(x) (bswap_32 (x))
#else
-#define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24))
+#define ENDSWAP_16(x) ((((x) >> 8) & 0xFF) | (((x) & 0xFF) << 8))
+#define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) & 0xFF00) << 8) | (((x) & 0xFF) << 24))
#endif
+
+/* Host to little-endian byte swapping. */
+#if CPU_IS_BIG_ENDIAN
+
+#define H2LE_16(x) ENDSWAP_16 (x)
+#define H2LE_32(x) ENDSWAP_32 (x)
+
+#else
+
+#define H2LE_16(x) (x)
+#define H2LE_32(x) (x)
+
+#endif
Modified: trunk/OpenMPT/include/flac/include/share/macros.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/macros.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/macros.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2013 Xiph.org Foundation
+ * Copyright (C) 2013-2014 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/share/private.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/private.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/private.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2013 Xiph.org Foundation
+ * Copyright (C) 2013-2014 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/share/safe_str.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/safe_str.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/safe_str.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2013 Xiph.org Foundation
+ * Copyright (C) 2013-2014 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/share/win_utf8_io.h
===================================================================
--- trunk/OpenMPT/include/flac/include/share/win_utf8_io.h 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/include/share/win_utf8_io.h 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2013 Xiph.Org Foundation
+ * Copyright (C) 2013-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -58,7 +58,7 @@
int rename_utf8(const char *oldname, const char *newname);
size_t strlen_utf8(const char *str);
int win_get_console_width(void);
-int print_console(FILE *stream, const wchar_t *text, uint32_t len);
+int print_console(FILE *stream, const wchar_t *text, size_t len);
HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
#ifdef __cplusplus
Modified: trunk/OpenMPT/include/flac/src/libFLAC/bitmath.c
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/bitmath.c 2014-11-21 16:02:10 UTC (rev 4609)
+++ trunk/OpenMPT/include/flac/src/libFLAC/bitmath.c 2014-11-28 17:19:35 UTC (rev 4610)
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2013 Xiph.Org Foundation
+ * Copyright (C) 2011-2014 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following condi...
[truncated message content] |
