merge from FLAC 1.1.1 maintenance branch (-j FLAC_RELEASE_1_1_1__2004_10_01 -j FLAC_RELEASE_1_1_1_MAINTENANCE_BRANCH (AKA FLAC_RELEASE_1_1_1_MAINTENANCE__MERGE_TO_TRUNK))

This commit is contained in:
Josh Coalson
2005-01-25 05:03:48 +00:00
parent 03197fa78e
commit 7ba64127f4
12 changed files with 130 additions and 30 deletions

View File

@@ -383,7 +383,7 @@
<TT>-o filename</TT>,<BR><TT>--output-name=filename</TT>
</TD>
<TD>
Force the output file name (usually <TT><B>flac</B></TT> just changes the extension). May only be used when encoding a single file. May not be used in conjunction with <TT>--output-prefix</T>.
Force the output file name (usually <TT><B>flac</B></TT> just changes the extension). May only be used when encoding a single file. May not be used in conjunction with <TT><A HREF="#flac_options_output_prefix">--output-prefix</A></TT>.
</TD>
</TR>
<TR>
@@ -519,7 +519,7 @@
<TR>
<TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
<A NAME="flac_options_apply_replaygain_which_is_not_lossless">
<TT>--apply-replaygain_which_is_not_lossless[=&lt;specification&gt;]</TT>
<TT>--apply-replaygain-which-is-not-lossless[=&lt;specification&gt;]</TT>
</TD>
<TD>
Applies ReplayGain values while decoding.