From 1ce20b6ac3762cb4ebe96f792d12fe8f2993e349 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 23 Oct 2002 22:18:37 +0000 Subject: [PATCH] final merge of changes from the end of the flac 1.0.4 maintenance branch --- configure.in | 2 +- doc/html/comparison.html | 2 +- doc/html/documentation.html | 15 +++++++++------ doc/html/index.html | 2 +- doc/html/news.html | 6 +++--- include/FLAC/all.h | 2 +- man/flac.sgml | 8 ++++---- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index bfcb1e50..1f36b6cb 100644 --- a/configure.in +++ b/configure.in @@ -265,7 +265,7 @@ main () fclose(output); exit(0); } -], . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"]) +], . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"]) AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR) AC_DEFINE_UNQUOTED(ID3LIB_MINOR, $ID3LIB_MINOR) AC_DEFINE_UNQUOTED(ID3LIB_PATCH, $ID3LIB_PATCH) diff --git a/doc/html/comparison.html b/doc/html/comparison.html index 54a7202f..b80d3d61 100644 --- a/doc/html/comparison.html +++ b/doc/html/comparison.html @@ -193,7 +193,7 @@ YES (Winamp, MacAmp Lite, XMMS, Apollo, dBpowerAMP, AlsaPlayer) - YES (PhatBox, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver) + YES (PhatBox, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver) YES diff --git a/doc/html/documentation.html b/doc/html/documentation.html index 15425411..f76a140f 100644 --- a/doc/html/documentation.html +++ b/doc/html/documentation.html @@ -490,9 +490,9 @@ You may use many -S options; the resulting SEEKTABLE will be the unique-ified union of all such values.
- With no -S options, flac defaults to '-S 100x'. Use -S- for no SEEKTABLE.
+ With no -S options, flac defaults to '-S 100x'. Use --no-seektable for no SEEKTABLE.
NOTE: -S #x will not work if the encoder can't determine the input size before starting.
- NOTE: if you use -S # and # is >= samples in the input, there will be either no seek point entered (if the input size is determinable before encoding starts) or a placeholder point (if input size is not determinable).
+ NOTE: if you use -S # and # is >= samples in the input, there will be either no seek point entered (if the input size is determinable before encoding starts) or a placeholder point (if input size is not determinable).
@@ -500,7 +500,7 @@ -P #, --padding=# - Tell the encoder to write a PADDING metadata block of the given length (in bytes) after the STREAMINFO block. This is useful if you plan to tag the file later with an APPLICATION block; instead of having to rewrite the entire file later just to insert your block, you can write directly over the PADDING block. Note that the total length of the PADDING block will be 4 bytes longer than the length given because of the 4 metadata block header bytes. You can force no PADDING block at all to be written with -P-, which is the default. + Tell the encoder to write a PADDING metadata block of the given length (in bytes) after the STREAMINFO block. This is useful if you plan to tag the file later with an APPLICATION block; instead of having to rewrite the entire file later just to insert your block, you can write directly over the PADDING block. Note that the total length of the PADDING block will be 4 bytes longer than the length given because of the 4 metadata block header bytes. You can force no PADDING block at all to be written with --no-padding, which is the default. @@ -524,7 +524,7 @@ -m, --mid-side - Enable mid-side coding (only for stereo streams). Tends to increase compression by a few percent on average. For each block both the stereo pair and mid-side versions of the block will be encoded, and smallest resulting frame will be stored. Currently mid-side encoding is only available when bits-per-sample <= 16. + Enable mid-side coding (only for stereo streams). Tends to increase compression by a few percent on average. For each block both the stereo pair and mid-side versions of the block will be encoded, and smallest resulting frame will be stored. Currently mid-side encoding is only available when bits-per-sample <= 16. @@ -644,7 +644,7 @@ -l #, --max-lpc-order=# - Specifies the maximum LPC order. This number must be <= 32. If 0, the encoder will not attempt generic linear prediction, and use only fixed predictors. Using fixed predictors is faster but usually results in files being 5-10% larger. + Specifies the maximum LPC order. This number must be <= 32. If 0, the encoder will not attempt generic linear prediction, and use only fixed predictors. Using fixed predictors is faster but usually results in files being 5-10% larger. @@ -888,7 +888,10 @@

diff --git a/doc/html/index.html b/doc/html/index.html index 5f656600..d5d47667 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -243,7 +243,7 @@ SourceForge project page
 Freshmeat page
 Hardware supporting FLAC:
 - PhatNoise car audio system: Phatbox + FLAC
 + PhatNoise car audio system: Phatbox + FLAC
 Rio Reciever and Dell Digital Audio Receiver via RioPlay client
 Software supporting FLAC:
 Patch for abcde (A Better CD Encoder)
 diff --git a/doc/html/news.html b/doc/html/news.html index cfd2d3d0..014c47fa 100644 --- a/doc/html/news.html +++ b/doc/html/news.html @@ -112,8 +112,8 @@
  • UTF-8 support in Vorbis comments.
  • New --import-vc-from and --export-vc-to commands for importing/exporting Vorbis comments from/to a file. For example, the following can be used to copy tags back and forth:
    - metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w -c file.ogg
    - vorbiscomment -l --raw file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac
    + metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w file.ogg
    + vorbiscomment --raw -l file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac
  • Fixed bug #606796 where metaflac was failing on read-only files.
    • @@ -199,7 +199,7 @@

    diff --git a/include/FLAC/all.h b/include/FLAC/all.h index f5eccbfa..2804f2e7 100644 --- a/include/FLAC/all.h +++ b/include/FLAC/all.h @@ -78,7 +78,7 @@ * to their counterparts in libFLAC. libOggFLAC is also licensed under * the LGPL. * - * \section cpp_api FLAC C API + * \section cpp_api FLAC C++ API * * The FLAC C++ API is a set of classes that encapsulate the * structures and functions in libFLAC. They provide slightly more diff --git a/man/flac.sgml b/man/flac.sgml index 00de8cb0..696ce81b 100644 --- a/man/flac.sgml +++ b/man/flac.sgml @@ -305,8 +305,8 @@ be added, the first being at sample 0. You may use many -S options; the resulting SEEKTABLE will be the unique-ified union of all such values. With no -S - options, flac defaults to '-S 100x'. Use -S- for - no SEEKTABLE. Note: '-S #x' will not work if the + options, flac defaults to '-S 100x'. Use --no-seektable + for no SEEKTABLE. Note: '-S #x' will not work if the encoder can't determine the input size before starting. Note: if you use '-S #' and # is >= samples in the input, there will be either no seek @@ -330,8 +330,8 @@ of the PADDING block will be 4 bytes longer than the length given because of the 4 metadata block header bytes. You can force no PADDING block at - all to be written with -P-, which is the default. - + all to be written with --no-padding, which is the + default.