merge down from merged-API-layer branch: cvs -q up -dP -j API_LAYER_MERGING_BASELINE...
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 13 Sep 2006 01:42:27 +0000 (01:42 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 13 Sep 2006 01:42:27 +0000 (01:42 +0000)
commit6b21f66784e1bcbe075b405668712e85eac39414
treecd1dcbb7cfd5041532ff7ba73b907c7e3af6a80d
parent461f3eb260107f60c4d7da1774075d09e5374d14
merge down from merged-API-layer branch: cvs -q up -dP -j API_LAYER_MERGING_BASELINE -j API_LAYER_MERGING_BRANCH
156 files changed:
FLAC.dsw
README
configure.in
doc/html/changelog.html
include/FLAC++/decoder.h
include/FLAC++/encoder.h
include/FLAC/Makefile.am
include/FLAC/all.h
include/FLAC/file_decoder.h [deleted file]
include/FLAC/file_encoder.h [deleted file]
include/FLAC/metadata.h
include/FLAC/seekable_stream_decoder.h [deleted file]
include/FLAC/seekable_stream_encoder.h [deleted file]
include/FLAC/stream_decoder.h
include/FLAC/stream_encoder.h
include/Makefile.am
include/OggFLAC++/decoder.h
include/OggFLAC++/encoder.h
include/OggFLAC/Makefile.am
include/OggFLAC/all.h
include/OggFLAC/file_decoder.h [deleted file]
include/OggFLAC/file_encoder.h [deleted file]
include/OggFLAC/seekable_stream_decoder.h [deleted file]
include/OggFLAC/seekable_stream_encoder.h [deleted file]
include/OggFLAC/stream_decoder.h
include/OggFLAC/stream_encoder.h
include/test_libs_common/Makefile.am [new file with mode: 0644]
include/test_libs_common/file_utils_flac.h [moved from src/test_libFLAC++/file_utils.h with 100% similarity]
include/test_libs_common/file_utils_oggflac.h [moved from src/test_libOggFLAC++/file_utils.h with 100% similarity]
include/test_libs_common/metadata_utils.h [moved from src/test_libFLAC++/metadata_utils.h with 100% similarity]
src/Makefile.am
src/Makefile.lite
src/flac/decode.c
src/flac/encode.c
src/flac/main.c
src/libFLAC++/Makefile.am
src/libFLAC++/Makefile.lite
src/libFLAC++/file_decoder.cpp
src/libFLAC++/file_encoder.cpp
src/libFLAC++/libFLAC++_dynamic.dsp
src/libFLAC++/libFLAC++_static.dsp
src/libFLAC++/seekable_stream_decoder.cpp [deleted file]
src/libFLAC++/seekable_stream_encoder.cpp [deleted file]
src/libFLAC++/stream_decoder.cpp
src/libFLAC++/stream_encoder.cpp
src/libFLAC/Makefile.am
src/libFLAC/Makefile.lite
src/libFLAC/file_decoder.c [deleted file]
src/libFLAC/file_encoder.c [deleted file]
src/libFLAC/include/protected/Makefile.am
src/libFLAC/include/protected/all.h
src/libFLAC/include/protected/file_decoder.h [deleted file]
src/libFLAC/include/protected/file_encoder.h [deleted file]
src/libFLAC/include/protected/seekable_stream_decoder.h [deleted file]
src/libFLAC/include/protected/seekable_stream_encoder.h [deleted file]
src/libFLAC/include/protected/stream_decoder.h
src/libFLAC/include/protected/stream_encoder.h
src/libFLAC/libFLAC_dynamic.dsp
src/libFLAC/libFLAC_static.dsp
src/libFLAC/metadata_iterators.c
src/libFLAC/metadata_object.c
src/libFLAC/seekable_stream_decoder.c [deleted file]
src/libFLAC/seekable_stream_encoder.c [deleted file]
src/libFLAC/stream_decoder.c
src/libFLAC/stream_encoder.c
src/libOggFLAC++/Makefile.am
src/libOggFLAC++/Makefile.lite
src/libOggFLAC++/file_decoder.cpp
src/libOggFLAC++/file_encoder.cpp
src/libOggFLAC++/libOggFLAC++_dynamic.dsp
src/libOggFLAC++/libOggFLAC++_static.dsp
src/libOggFLAC++/seekable_stream_decoder.cpp [deleted file]
src/libOggFLAC++/seekable_stream_encoder.cpp [deleted file]
src/libOggFLAC++/stream_decoder.cpp
src/libOggFLAC++/stream_encoder.cpp
src/libOggFLAC/Makefile.am
src/libOggFLAC/Makefile.lite
src/libOggFLAC/file_decoder.c [deleted file]
src/libOggFLAC/file_encoder.c [deleted file]
src/libOggFLAC/include/private/ogg_decoder_aspect.h
src/libOggFLAC/include/private/ogg_helper.h
src/libOggFLAC/include/protected/Makefile.am
src/libOggFLAC/include/protected/all.h
src/libOggFLAC/include/protected/file_decoder.h [deleted file]
src/libOggFLAC/include/protected/file_encoder.h [deleted file]
src/libOggFLAC/include/protected/seekable_stream_decoder.h [deleted file]
src/libOggFLAC/include/protected/seekable_stream_encoder.h [deleted file]
src/libOggFLAC/include/protected/stream_encoder.h
src/libOggFLAC/libOggFLAC_dynamic.dsp
src/libOggFLAC/libOggFLAC_static.dsp
src/libOggFLAC/ogg_decoder_aspect.c
src/libOggFLAC/ogg_encoder_aspect.c
src/libOggFLAC/ogg_helper.c
src/libOggFLAC/seekable_stream_decoder.c [deleted file]
src/libOggFLAC/seekable_stream_encoder.c [deleted file]
src/libOggFLAC/stream_decoder.c
src/libOggFLAC/stream_encoder.c
src/metaflac/operations_shorthand_seektable.c
src/plugin_winamp2/in_flac.c
src/plugin_winamp2/playback.c
src/plugin_winamp2/playback.h
src/plugin_xmms/http.c
src/plugin_xmms/http.h
src/plugin_xmms/plugin.c
src/share/grabbag/replaygain.c
src/share/grabbag/seektable.c
src/test_libFLAC++/Makefile.am
src/test_libFLAC++/Makefile.lite
src/test_libFLAC++/README [deleted file]
src/test_libFLAC++/decoders.cpp
src/test_libFLAC++/encoders.cpp
src/test_libFLAC++/metadata_manip.cpp
src/test_libFLAC++/metadata_utils.c [deleted file]
src/test_libFLAC++/test_libFLAC++.dsp
src/test_libFLAC/Makefile.am
src/test_libFLAC/Makefile.lite
src/test_libFLAC/decoders.c
src/test_libFLAC/encoders.c
src/test_libFLAC/file_utils.c [deleted file]
src/test_libFLAC/file_utils.h [deleted file]
src/test_libFLAC/metadata_manip.c
src/test_libFLAC/metadata_object.c
src/test_libFLAC/metadata_utils.c [deleted file]
src/test_libFLAC/metadata_utils.h [deleted file]
src/test_libFLAC/test_libFLAC.dsp
src/test_libOggFLAC++/Makefile.am
src/test_libOggFLAC++/Makefile.lite
src/test_libOggFLAC++/README [deleted file]
src/test_libOggFLAC++/decoders.cpp
src/test_libOggFLAC++/encoders.cpp
src/test_libOggFLAC++/metadata_utils.h [deleted file]
src/test_libOggFLAC++/test_libOggFLAC++.dsp
src/test_libOggFLAC/Makefile.am
src/test_libOggFLAC/Makefile.lite
src/test_libOggFLAC/README [deleted file]
src/test_libOggFLAC/decoders.c
src/test_libOggFLAC/encoders.c
src/test_libOggFLAC/file_utils.c [deleted file]
src/test_libOggFLAC/file_utils.h [deleted file]
src/test_libOggFLAC/metadata_utils.c [deleted file]
src/test_libOggFLAC/metadata_utils.h [deleted file]
src/test_libOggFLAC/test_libOggFLAC.dsp
src/test_libs_common/Makefile.am [new file with mode: 0644]
src/test_libs_common/Makefile.lite [new file with mode: 0644]
src/test_libs_common/README [new file with mode: 0644]
src/test_libs_common/file_utils_flac.c [moved from src/test_libFLAC++/file_utils.c with 93% similarity]
src/test_libs_common/file_utils_oggflac.c [moved from src/test_libOggFLAC++/file_utils.c with 88% similarity]
src/test_libs_common/metadata_utils.c [moved from src/test_libOggFLAC++/metadata_utils.c with 99% similarity]
src/test_libs_common/test_libs_common_static.dsp [new file with mode: 0644]
src/test_seeking/main.c
test/cuesheets/Makefile.am
test/flac-to-flac-metadata-test-files/Makefile.am
test/flac-to-flac-metadata-test-files/case03c-expect.meta
test/flac-to-flac-metadata-test-files/case04c-expect.meta
test/metaflac-test-files/case07-expect.meta
test/test_seeking.sh