projects
/
platform
/
upstream
/
flac.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9d8b9e
)
bump version number to 1.1.4
author
Josh Coalson
<jcoalson@users.sourceforce.net>
Wed, 14 Feb 2007 05:57:23 +0000
(
05:57
+0000)
committer
Josh Coalson
<jcoalson@users.sourceforce.net>
Wed, 14 Feb 2007 05:57:23 +0000
(
05:57
+0000)
README
patch
|
blob
|
history
configure.in
patch
|
blob
|
history
doc/Doxyfile
patch
|
blob
|
history
flac.pbproj/project.pbxproj
patch
|
blob
|
history
src/libFLAC/format.c
patch
|
blob
|
history
src/libFLAC/libFLAC_dynamic.dsp
patch
|
blob
|
history
src/libFLAC/libFLAC_static.dsp
patch
|
blob
|
history
src/plugin_winamp2/in_flac.c
patch
|
blob
|
history
src/plugin_winamp2/in_flac.dsp
patch
|
blob
|
history
test/metaflac-test-files/case07-expect.meta
patch
|
blob
|
history
diff --git
a/README
b/README
index
1f5d7fe
..
79a03e1
100644
(file)
--- a/
README
+++ b/
README
@@
-38,7
+38,7
@@
Documentation License (see COPYING.FDL).
===============================================================================
===============================================================================
-FLAC - 1.1.
3
- Contents
+FLAC - 1.1.
4
- Contents
===============================================================================
- Introduction
===============================================================================
- Introduction
diff --git
a/configure.in
b/configure.in
index
fe542dc
..
4c2b773
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-19,7
+19,7
@@
# instead of FLAC__ since autoconf triggers off 'AC_' in strings
AC_INIT(src/flac/main.c)
# instead of FLAC__ since autoconf triggers off 'AC_' in strings
AC_INIT(src/flac/main.c)
-AM_INIT_AUTOMAKE(flac, 1.1.4
-alpha1
)
+AM_INIT_AUTOMAKE(flac, 1.1.4)
# Don't automagically regenerate autoconf/automake generated files unless
# explicitly requested. Eases autobuilding -mdz
# Don't automagically regenerate autoconf/automake generated files unless
# explicitly requested. Eases autobuilding -mdz
diff --git
a/doc/Doxyfile
b/doc/Doxyfile
index
e52e779
..
8b9a877
100644
(file)
--- a/
doc/Doxyfile
+++ b/
doc/Doxyfile
@@
-23,7
+23,7
@@
PROJECT_NAME = FLAC
# This could be handy for archiving the generated documentation or
# if some version control system is used.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.1.
3
+PROJECT_NUMBER = 1.1.
4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git
a/flac.pbproj/project.pbxproj
b/flac.pbproj/project.pbxproj
index
89cbfbf
..
a1e3793
100644
(file)
--- a/
flac.pbproj/project.pbxproj
+++ b/
flac.pbproj/project.pbxproj
@@
-2798,7
+2798,7
@@
HEADER_SEARCH_PATHS = "src/libFLAC/include include";
LIBRARY_STYLE = STATIC;
OPTIMIZATION_CFLAGS = "-O3";
HEADER_SEARCH_PATHS = "src/libFLAC/include include";
LIBRARY_STYLE = STATIC;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
3
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
4
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA";
OTHER_LDFLAGS = "";
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
@@
-3108,7
+3108,7
@@
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
3
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
4
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
OTHER_LDFLAGS = "-logg";
OTHER_REZFLAGS = "";
PRODUCT_NAME = flac;
OTHER_LDFLAGS = "-logg";
OTHER_REZFLAGS = "";
PRODUCT_NAME = flac;
@@
-4124,7
+4124,7
@@
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
3
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.
4
\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
OTHER_REZFLAGS = "";
PRODUCT_NAME = metaflac;
REZ_EXECUTABLE = YES;
OTHER_REZFLAGS = "";
PRODUCT_NAME = metaflac;
REZ_EXECUTABLE = YES;
diff --git
a/src/libFLAC/format.c
b/src/libFLAC/format.c
index
46ac754
..
3a865b4
100644
(file)
--- a/
src/libFLAC/format.c
+++ b/
src/libFLAC/format.c
@@
-56,9
+56,9
@@
FLAC_API const char *FLAC__VERSION_STRING = VERSION;
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__
/* yet one more hack because of MSVC6: */
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__
/* yet one more hack because of MSVC6: */
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.4
-alpha1 20070201
";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.4
20070213
";
#else
#else
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 200702
01
";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 200702
13
";
#endif
FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
#endif
FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
diff --git
a/src/libFLAC/libFLAC_dynamic.dsp
b/src/libFLAC/libFLAC_dynamic.dsp
index
4c9cb73
..
97de0e0
100644
(file)
--- a/
src/libFLAC/libFLAC_dynamic.dsp
+++ b/
src/libFLAC/libFLAC_dynamic.dsp
@@
-43,7
+43,7
@@
RSC=rc.exe
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
\r
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
\r
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.1.4
alpha1
\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
\r
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.1.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
@@
-69,7
+69,7
@@
LINK32=link.exe
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
\r
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
\r
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.1.4
alpha1
\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
\r
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "FLAC_API_EXPORTS" /D "FLAC__HAS_OGG" /D VERSION=\"1.1.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"
\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"
\r
diff --git
a/src/libFLAC/libFLAC_static.dsp
b/src/libFLAC/libFLAC_static.dsp
index
ab9becc
..
c3ca405
100644
(file)
--- a/
src/libFLAC/libFLAC_static.dsp
+++ b/
src/libFLAC/libFLAC_static.dsp
@@
-41,7
+41,7
@@
RSC=rc.exe
# PROP Intermediate_Dir "Release_static"
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
\r
# PROP Intermediate_Dir "Release_static"
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.4
alpha1
\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.4\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
# ADD RSC /l 0x409 /d "NDEBUG"
\r
BSC32=bscmake.exe
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
# ADD RSC /l 0x409 /d "NDEBUG"
\r
BSC32=bscmake.exe
\r
@@
-64,7
+64,7
@@
LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug_static"
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
\r
# PROP Intermediate_Dir "Debug_static"
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.4
alpha1
\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.4\" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "FLAC__OVERFLOW_DETECT" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"
\r
# ADD RSC /l 0x409 /d "_DEBUG"
\r
BSC32=bscmake.exe
\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"
\r
# ADD RSC /l 0x409 /d "_DEBUG"
\r
BSC32=bscmake.exe
\r
diff --git
a/src/plugin_winamp2/in_flac.c
b/src/plugin_winamp2/in_flac.c
index
a467b4c
..
390ef34
100644
(file)
--- a/
src/plugin_winamp2/in_flac.c
+++ b/
src/plugin_winamp2/in_flac.c
@@
-29,7
+29,7
@@
#include "infobox.h"
\r
#include "tagz.h"
\r
\r
#include "infobox.h"
\r
#include "tagz.h"
\r
\r
-#define PLUGIN_VERSION "1.1.
3
"
\r
+#define PLUGIN_VERSION "1.1.
4
"
\r
\r
static In_Module mod_; /* the input module (declared near the bottom of this file) */
\r
static char lastfn_[MAX_PATH]; /* currently playing file (used for getting info on the current file) */
\r
\r
static In_Module mod_; /* the input module (declared near the bottom of this file) */
\r
static char lastfn_[MAX_PATH]; /* currently playing file (used for getting info on the current file) */
\r
diff --git
a/src/plugin_winamp2/in_flac.dsp
b/src/plugin_winamp2/in_flac.dsp
index
a41b8e2
..
e1bd618
100644
(file)
--- a/
src/plugin_winamp2/in_flac.dsp
+++ b/
src/plugin_winamp2/in_flac.dsp
@@
-43,7
+43,7
@@
RSC=rc.exe
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c
\r
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c
\r
-# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.4
alpha1
\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c
\r
+# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.4\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c
\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
\r
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"
\r
@@
-70,7
+70,7
@@
LINK32=link.exe
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c
\r
# PROP Ignore_Export_Lib 0
\r
# PROP Target_Dir ""
\r
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c
\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.4
alpha1
\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c
\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.4\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c
\r
# SUBTRACT CPP /WX
\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
\r
# SUBTRACT CPP /WX
\r
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
\r
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
\r
diff --git
a/test/metaflac-test-files/case07-expect.meta
b/test/metaflac-test-files/case07-expect.meta
index
254832d
..
4ccb0bd
100644
(file)
--- a/
test/metaflac-test-files/case07-expect.meta
+++ b/
test/metaflac-test-files/case07-expect.meta
@@
-1,4
+1,4
@@
-reference libFLAC 1.1.4 2007021
1
+reference libFLAC 1.1.4 2007021
3
ARTIST=The_artist_formerly_known_as_the_artist...
ARTIST=Chuck_Woolery
ARTIST=Vern
ARTIST=The_artist_formerly_known_as_the_artist...
ARTIST=Chuck_Woolery
ARTIST=Vern