diff options
| author | luz.paz <luzpaz@users.noreply.github.com> | 2018-05-22 10:17:53 -0400 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2018-05-24 07:20:19 +1000 |
| commit | 01eb19708c11f6aae1013e7c9c29c83efda33bfb (patch) | |
| tree | 63e8b47f83baacc674f28f5328fa52d045fd45d2 | |
| parent | 0db0e878b8c7eb09f9f42fb39ca43b7cbc5e8aca (diff) | |
| download | flac-01eb19708c11f6aae1013e7c9c29c83efda33bfb.tar.gz | |
Fix miscellaneous typos.
Found via `codespell -q 3`
31 files changed, 41 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index 9a1570c0..ffde189a 100644 --- a/configure.ac +++ b/configure.ac @@ -345,7 +345,7 @@ AC_ARG_ENABLE([ogg], [ want_ogg=$enableval ], [ want_ogg=yes ] ) if test "x$want_ogg" != "xno"; then - XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) + XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development environment not installed - Ogg support will not be built])) fi FLAC__HAS_OGG=0 diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index b6bf2ed5..ba71f8f9 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -386,7 +386,7 @@ SHOW_DIRECTORIES = YES # version control system). Doxygen will invoke the program by executing (via # popen()) the command <command> <input-file>, where <command> is the value of # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. FILE_VERSION_FILTER = diff --git a/doc/html/changelog.html b/doc/html/changelog.html index 5cc98e9f..214a62c4 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -42,7 +42,7 @@ </div> <div class="box_header"></div> <div class="box_body"> - This is an informal changelog, a summary of changes in each release. (See also <a href="documentation_bugs.html">known bugs</a>.) Particulary important for developers is the precise description of changes to the library interfaces. See also the <a href="api/group__porting.html">porting guide</a> for specific instructions on porting to newer versions of FLAC.<br /> + This is an informal changelog, a summary of changes in each release. (See also <a href="documentation_bugs.html">known bugs</a>.) Particularly important for developers is the precise description of changes to the library interfaces. See also the <a href="api/group__porting.html">porting guide</a> for specific instructions on porting to newer versions of FLAC.<br /> <a name="flac_1_3_2"><b>FLAC 1.3.2</b> (01-Jan-2017)</a> @@ -331,7 +331,7 @@ <li> libFLAC++: <ul> - <li>Add a number of convienience methods.</li> + <li>Add a number of convenience methods.</li> </ul> </li> </ul> @@ -718,8 +718,8 @@ <li> libraries: <ul> - <li>Merged libOggFLAC into libFLAC; both formats are now supporte through the same API.</li> - <li>Merged libOggFLAC++ into libFLAC++; both formats are now supporte through the same API.</li> + <li>Merged libOggFLAC into libFLAC; both formats are now supported through the same API.</li> + <li>Merged libOggFLAC++ into libFLAC++; both formats are now supported through the same API.</li> <li>libFLAC and libFLAC++: Simplified encoder setup with new <span class="argument">FLAC__stream_encoder_set_compression_level()</span> function.</li> <li>libFLAC: Improved compression with no impact on FLAC format or decoding time by adding a windowing stage before LPC analysis.</li> <li>libFLAC: Fixed a bug where missing STREAMINFO fields (min/max framesize, total samples, MD5 sum) and seek point offsets were not getting rewritten back to Ogg FLAC file (<a href="http://sourceforge.net/p/flac/bugs/197/">SF #1338969</a>).</li> @@ -734,8 +734,8 @@ <li> all libraries; <ul> - <li>Merged libOggFLAC into libFLAC; both formats are now supporte through the same API.</li> - <li>Merged libOggFLAC++ into libFLAC++; both formats are now supporte through the same API.</li> + <li>Merged libOggFLAC into libFLAC; both formats are now supported through the same API.</li> + <li>Merged libOggFLAC++ into libFLAC++; both formats are now supported through the same API.</li> <li>Merged seekable stream decoder and file decoder into the stream decoder.</li> <li>Merged seekable stream encoder and file encoder into the stream encoder.</li> <li>Added #defines for the API version number to make porting easier; see <tt>include/lib*FLAC*/export.h</tt>.</li> diff --git a/doc/html/documentation_format_overview.html b/doc/html/documentation_format_overview.html index f2742e15..758f6cb8 100644 --- a/doc/html/documentation_format_overview.html +++ b/doc/html/documentation_format_overview.html @@ -73,7 +73,7 @@ <br /> <b>MODELING</b><br /> <br /> - In the next stage, the encoder tries to approximate the signal with a function in such a way that when the approximation is subracted, the result (called the <i>residual</i>, <i>residue</i>, or <i>error</i>) requires fewer bits-per-sample to encode. The function's parameters also have to be transmitted so they should not be so complex as to eat up the savings. FLAC has two methods of forming approximations: 1) fitting a simple polynomial to the signal; and 2) general linear predictive coding (LPC). I will not go into the details here, only some generalities that involve the encoding options.<br /> + In the next stage, the encoder tries to approximate the signal with a function in such a way that when the approximation is subtracted, the result (called the <i>residual</i>, <i>residue</i>, or <i>error</i>) requires fewer bits-per-sample to encode. The function's parameters also have to be transmitted so they should not be so complex as to eat up the savings. FLAC has two methods of forming approximations: 1) fitting a simple polynomial to the signal; and 2) general linear predictive coding (LPC). I will not go into the details here, only some generalities that involve the encoding options.<br /> <br /> First, fixed polynomial prediction (specified with <span class="argument">-l 0</span>) is much faster, but less accurate than LPC. The higher the maximum LPC order, the slower, but more accurate, the model will be. However, there are diminishing returns with increasing orders. Also, at some point (usually around order 9) the part of the encoder that guesses what is the best order to use will start to get it wrong and the compression will actually decrease slightly; at that point you will have to you will have to use the exhaustive search option <span class="argument">-e</span> to overcome this, which is significantly slower.<br /> <br /> diff --git a/doc/html/documentation_tools_flac.html b/doc/html/documentation_tools_flac.html index 09c8f244..aca194b6 100644 --- a/doc/html/documentation_tools_flac.html +++ b/doc/html/documentation_tools_flac.html @@ -538,7 +538,7 @@ <span class="argument">-V</span>, <span class="argument">--verify</span> </td> <td> - Verify the encoding process. With this option, <span class="commandname">flac</span> will create a parallel decoder that decodes the output of the encoder and compares the result against the original. It will abort immediately with an error if a mismatch occurs. <span class="argument">-V</span> increases the total encoding time but is guaranteed to catch any unforseen bug in the encoding process. + Verify the encoding process. With this option, <span class="commandname">flac</span> will create a parallel decoder that decodes the output of the encoder and compares the result against the original. It will abort immediately with an error if a mismatch occurs. <span class="argument">-V</span> increases the total encoding time but is guaranteed to catch any unforeseen bug in the encoding process. </td> </tr> <tr> @@ -612,7 +612,7 @@ <br /> <span class="argument">DESCRIPTION</span> is optional; the default is an empty string.<br /> <br /> - The next part specfies the resolution and color information. If the <span class="argument">MIME-TYPE</span> is <tt>image/jpeg</tt>, <tt>image/png</tt>, or <tt>image/gif</tt>, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.<br /> + The next part specifies the resolution and color information. If the <span class="argument">MIME-TYPE</span> is <tt>image/jpeg</tt>, <tt>image/png</tt>, or <tt>image/gif</tt>, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.<br /> <br /> <span class="argument">FILE</span> is the path to the picture file to be imported, or the URL if MIME type is --><br /> <br /> diff --git a/doc/html/format.html b/doc/html/format.html index 1047092a..20f257a2 100644 --- a/doc/html/format.html +++ b/doc/html/format.html @@ -175,7 +175,7 @@ <br /> <a name="definitions"><font size="+1"><b><u>Definitions</u></b></font></a><br /> <br /> - Many terms like "block" and "frame" are used to mean different things in differenct encoding schemes. For example, a frame in MP3 corresponds to many samples across several channels, whereas an S/PDIF frame represents just one sample for each channel. The definitions we use for FLAC follow. Note that when we talk about blocks and subblocks we are referring to the raw unencoded audio data that is the input to the encoder, and when we talk about frames and subframes, we are referring to the FLAC-encoded data. + Many terms like "block" and "frame" are used to mean different things in different encoding schemes. For example, a frame in MP3 corresponds to many samples across several channels, whereas an S/PDIF frame represents just one sample for each channel. The definitions we use for FLAC follow. Note that when we talk about blocks and subblocks we are referring to the raw unencoded audio data that is the input to the encoder, and when we talk about frames and subframes, we are referring to the FLAC-encoded data. <ul> <li> <b>Block</b>: One or more audio samples that span several channels. @@ -241,7 +241,7 @@ <br /> FLAC currently defines two similar methods for the coding of the error signal from the prediction stage. The error signal is coded using Rice codes in one of two ways: 1) the encoder estimates a single Rice parameter based on the variance of the residual and Rice codes the entire residual using this parameter; 2) the residual is partitioned into several equal-length regions of contiguous samples, and each region is coded with its own Rice parameter based on the region's mean. (Note that the first method is a special case of the second method with one partition, except the Rice parameter is based on the residual variance instead of the mean.)<br /> <br /> - The FLAC format has reserved space for other coding methods. Some possiblities for volunteers would be to explore better context-modeling of the Rice parameter, or Huffman coding. See <a href="http://www.hpl.hp.com/techreports/98/HPL-98-193.html">LOCO-I</a> and <a href="http://www.cs.tut.fi/~albert/Dev/pucrunch/packing.html">pucrunch</a> for descriptions of several universal codes.<br /> + The FLAC format has reserved space for other coding methods. Some possibilities for volunteers would be to explore better context-modeling of the Rice parameter, or Huffman coding. See <a href="http://www.hpl.hp.com/techreports/98/HPL-98-193.html">LOCO-I</a> and <a href="http://www.cs.tut.fi/~albert/Dev/pucrunch/packing.html">pucrunch</a> for descriptions of several universal codes.<br /> <br /> <a name="format_overview"><font size="+1"><b><u>Format</u></b></font></a><br /> <br /> diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h index 5cb4c7ef..6a2d901f 100644 --- a/include/FLAC++/decoder.h +++ b/include/FLAC++/decoder.h @@ -94,7 +94,7 @@ namespace FLAC { * Only the read, write, and error callbacks are mandatory. The * others are optional; this class provides default * implementations that do nothing. In order for seeking to work - * you must overide seek_callback(), tell_callback(), + * you must override seek_callback(), tell_callback(), * length_callback(), and eof_callback(). */ class FLACPP_API Stream { diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h index 90b7f8c7..ce8d80a4 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -95,7 +95,7 @@ namespace FLAC { * Only the write callback is mandatory. The others are * optional; this class provides default implementations that do * nothing. In order for some STREAMINFO and SEEKTABLE data to - * be written properly, you must overide seek_callback() and + * be written properly, you must override seek_callback() and * tell_callback(); see FLAC__stream_encoder_init_stream() as to * why. */ diff --git a/include/FLAC/callback.h b/include/FLAC/callback.h index f942dd25..38e23002 100644 --- a/include/FLAC/callback.h +++ b/include/FLAC/callback.h @@ -165,7 +165,7 @@ typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle); * required may be set to NULL. * * If the seek requirement for an interface is optional, you can signify that - * a data sorce is not seekable by setting the \a seek field to \c NULL. + * a data source is not seekable by setting the \a seek field to \c NULL. */ typedef struct { FLAC__IOCallback_Read read; diff --git a/include/FLAC/metadata.h b/include/FLAC/metadata.h index 7316d5dd..4c67b87f 100644 --- a/include/FLAC/metadata.h +++ b/include/FLAC/metadata.h @@ -93,7 +93,7 @@ * Efficient means the whole file is rewritten at most one time, and only * when necessary. Level 1 is not efficient only in the case that you * cause more than one metadata block to grow or shrink beyond what can - * be accomodated by padding. In this case you should probably use level + * be accommodated by padding. In this case you should probably use level * 2, which allows you to edit all the metadata for a file in memory and * write it out all at once. * diff --git a/include/share/compat.h b/include/share/compat.h index 491b5cbd..f425ca36 100644 --- a/include/share/compat.h +++ b/include/share/compat.h @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* This is the prefered location of all CPP hackery to make $random_compiler +/* This is the preferred location of all CPP hackery to make $random_compiler * work like something approaching a C99 (or maybe more accurately GNU99) * compiler. * diff --git a/m4/bswap.m4 b/m4/bswap.m4 index e6793d69..f504dcb7 100644 --- a/m4/bswap.m4 +++ b/m4/bswap.m4 @@ -36,7 +36,7 @@ dnl Dtermine whether the compiler has the __builtin_bswap32() intrinsic which dnl is likely to be present for most versions of GCC as well as Clang. AC_DEFUN([XIPH_C_BSWAP32], -[AC_CACHE_CHECK(for bswap32 instrinsic, +[AC_CACHE_CHECK(for bswap32 intrinsic, ac_cv_c_bswap32, # Initialize to no @@ -63,7 +63,7 @@ dnl Dtermine whether the compiler has the __builtin_bswap16() intrinsic which dnl is likely to be present for most versions of GCC as well as Clang. AC_DEFUN([XIPH_C_BSWAP16], -[AC_CACHE_CHECK(for bswap16 instrinsic, +[AC_CACHE_CHECK(for bswap16 intrinsic, ac_cv_c_bswap16, # Initialize to no @@ -101,7 +101,7 @@ int main () echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" + echo "*** exact error that occurred. This usually means Ogg was incorrectly installed" echo "*** or that you have moved Ogg since it was installed." ]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" @@ -127,7 +127,7 @@ else echo "*** being found. The easiest way to fix this is to remove the old version" echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" echo "*** correct copy of xmms-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" + echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" echo "*** so that the correct libraries are found at run-time)" fi fi @@ -201,7 +201,7 @@ MIME-TYPE is optional; if left blank, it will be detected from the file. For be DESCRIPTION is optional; the default is an empty string. -The next part specfies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy. +The next part specifies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy. FILE is the path to the picture file to be imported, or the URL if MIME type is --> diff --git a/man/flac.sgml b/man/flac.sgml index 6dc19f31..87a3f238 100644 --- a/man/flac.sgml +++ b/man/flac.sgml @@ -417,7 +417,7 @@ <para>DESCRIPTION is optional; the default is an empty string.</para> - <para>The next part specfies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.</para> + <para>The next part specifies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.</para> <para>FILE is the path to the picture file to be imported, or the URL if MIME type is --></para> diff --git a/man/metaflac.1 b/man/metaflac.1 index e9e77f74..0c1c66bc 100644 --- a/man/metaflac.1 +++ b/man/metaflac.1 @@ -174,7 +174,7 @@ MIME-TYPE is optional; if left blank, it will be detected from the file. For be DESCRIPTION is optional; the default is an empty string. -The next part specfies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy. +The next part specifies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy. FILE is the path to the picture file to be imported, or the URL if MIME type is --> diff --git a/man/metaflac.sgml b/man/metaflac.sgml index a87ea580..219cca4a 100644 --- a/man/metaflac.sgml +++ b/man/metaflac.sgml @@ -343,7 +343,7 @@ manpage.1: manpage.sgml <para>DESCRIPTION is optional; the default is an empty string.</para> - <para>The next part specfies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.</para> + <para>The next part specifies the resolution and color information. If the MIME-TYPE is image/jpeg, image/png, or image/gif, you can usually leave this empty and they can be detected from the file. Otherwise, you must specify the width in pixels, height in pixels, and color depth in bits-per-pixel. If the image has indexed colors you should also specify the number of colors used. When manually specified, it is not checked against the file for accuracy.</para> <para>FILE is the path to the picture file to be imported, or the URL if MIME type is --></para> diff --git a/src/flac/main.c b/src/flac/main.c index c6d9b1e3..e36d8630 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -1520,7 +1520,7 @@ void show_explain(void) printf(" mean that FILE is actually a URL to an image, though this use is\n"); printf(" discouraged.\n"); printf(" DESCRIPTION is optional; the default is an empty string\n"); - printf(" The next part specfies the resolution and color information. If\n"); + printf(" The next part specifies the resolution and color information. If\n"); printf(" the MIME-TYPE is image/jpeg, image/png, or image/gif, you can\n"); printf(" usually leave this empty and they can be detected from the file.\n"); printf(" Otherwise, you must specify the width in pixels, height in pixels,\n"); @@ -1610,7 +1610,7 @@ void show_explain(void) printf(" does nothing if using -l 0\n"); printf(" -q, --qlp-coeff-precision=# Specify precision in bits of quantized\n"); printf(" linear-predictor coefficients; 0 => let\n"); - printf(" encoder decide (the minimun is %u, the\n", FLAC__MIN_QLP_COEFF_PRECISION); + printf(" encoder decide (the minimum is %u, the\n", FLAC__MIN_QLP_COEFF_PRECISION); printf(" default is -q 0)\n"); printf(" -r, --rice-partition-order=[#,]# Set [min,]max residual partition order\n"); printf(" (# is 0 to 15 inclusive; min defaults to 0;\n"); diff --git a/src/libFLAC++/libFLAC++.m4 b/src/libFLAC++/libFLAC++.m4 index bf37529d..d9e05f85 100644 --- a/src/libFLAC++/libFLAC++.m4 +++ b/src/libFLAC++/libFLAC++.m4 @@ -97,7 +97,7 @@ int main () echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libFLAC++ was incorrectly installed" + echo "*** exact error that occurred. This usually means libFLAC++ was incorrectly installed" echo "*** or that you have moved libFLAC++ since it was installed. In the latter case, you" echo "*** may want to edit the libFLAC++-config script: $LIBFLACPP_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c index 6a415099..935208a5 100644 --- a/src/libFLAC/bitreader.c +++ b/src/libFLAC/bitreader.c @@ -173,7 +173,7 @@ static FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br) /* before reading, if the existing reader looks like this (say brword is 32 bits wide) * bitstream : 11 22 33 44 55 br->words=1 br->bytes=1 (partial tail word is left-justified) - * buffer[BE]: 11 22 33 44 55 ?? ?? ?? (shown layed out as bytes sequentially in memory) + * buffer[BE]: 11 22 33 44 55 ?? ?? ?? (shown laid out as bytes sequentially in memory) * buffer[LE]: 44 33 22 11 ?? ?? ?? 55 (?? being don't-care) * ^^-------target, bytes=3 * on LE machines, have to byteswap the odd tail word so nothing is diff --git a/src/libFLAC/libFLAC.m4 b/src/libFLAC/libFLAC.m4 index da7354e9..9bf2bf36 100644 --- a/src/libFLAC/libFLAC.m4 +++ b/src/libFLAC/libFLAC.m4 @@ -98,7 +98,7 @@ int main () echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libFLAC was incorrectly installed" + echo "*** exact error that occurred. This usually means libFLAC was incorrectly installed" echo "*** or that you have moved libFLAC since it was installed. In the latter case, you" echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" diff --git a/src/libFLAC/ogg_decoder_aspect.c b/src/libFLAC/ogg_decoder_aspect.c index 44f39219..7c814a24 100644 --- a/src/libFLAC/ogg_decoder_aspect.c +++ b/src/libFLAC/ogg_decoder_aspect.c @@ -111,7 +111,7 @@ FLAC__OggDecoderAspectReadStatus FLAC__ogg_decoder_aspect_read_callback_wrapper( * decoder will eventually call the read callback to supply some data, * but how much it asks for depends on how much free space it has in * its internal buffer. It does not try to grow its internal buffer - * to accomodate a whole frame because then the internal buffer size + * to accommodate a whole frame because then the internal buffer size * could not be limited, which is necessary in embedded applications. * * Ogg however grows its internal buffer until a whole page is present; diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index dd5d01fa..40ea8264 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -3020,7 +3020,7 @@ FLAC__bool seek_to_absolute_sample_(FLAC__StreamDecoder *decoder, FLAC__uint64 s * min_blocksize might be zero. */ else if(min_blocksize == max_blocksize && min_blocksize > 0) { - /* note there are no () around 'bps/8' to keep precision up since it's an integer calulation */ + /* note there are no () around 'bps/8' to keep precision up since it's an integer calculation */ approx_bytes_per_frame = min_blocksize * channels * bps/8 + 64; } else diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 32df4d32..87cfb580 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -650,7 +650,7 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( encoder->protected_->loose_mid_side_stereo = false; if(encoder->protected_->bits_per_sample >= 32) - encoder->protected_->do_mid_side_stereo = false; /* since we currenty do 32-bit math, the side channel would have 33 bps and overflow */ + encoder->protected_->do_mid_side_stereo = false; /* since we currently do 32-bit math, the side channel would have 33 bps and overflow */ if(encoder->protected_->bits_per_sample < FLAC__MIN_BITS_PER_SAMPLE || encoder->protected_->bits_per_sample > FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE) return FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE; @@ -1913,7 +1913,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encod } /* - * These three functions are not static, but not publically exposed in + * These three functions are not static, but not publicly exposed in * include/FLAC/ either. They are used by the test suite. */ FLAC_API FLAC__bool FLAC__stream_encoder_disable_constant_subframes(FLAC__StreamEncoder *encoder, FLAC__bool value) diff --git a/src/metaflac/usage.c b/src/metaflac/usage.c index 8c7942a5..46c39486 100644 --- a/src/metaflac/usage.c +++ b/src/metaflac/usage.c @@ -192,7 +192,7 @@ int long_usage(const char *message, ...) fprintf(out, " mean that FILE is actually a URL to an image, though this use is\n"); fprintf(out, " discouraged.\n"); fprintf(out, " DESCRIPTION is optional; the default is an empty string\n"); - fprintf(out, " The next part specfies the resolution and color information. If\n"); + fprintf(out, " The next part specifies the resolution and color information. If\n"); fprintf(out, " the MIME-TYPE is image/jpeg, image/png, or image/gif, you can\n"); fprintf(out, " usually leave this empty and they can be detected from the file.\n"); fprintf(out, " Otherwise, you must specify the width in pixels, height in pixels,\n"); diff --git a/src/plugin_xmms/configure.c b/src/plugin_xmms/configure.c index 58af3d36..a4889c06 100644 --- a/src/plugin_xmms/configure.c +++ b/src/plugin_xmms/configure.c @@ -46,7 +46,7 @@ #include "locale_hack.h" /* - * Initialize Global Valueable + * Initialize Global Variable */ flac_config_t flac_cfg = { /* title */ diff --git a/src/plugin_xmms/tag.c b/src/plugin_xmms/tag.c index 5f833884..a8ecab43 100644 --- a/src/plugin_xmms/tag.c +++ b/src/plugin_xmms/tag.c @@ -43,7 +43,7 @@ /* * Function local__extname (filename) * - * Return pointer within filename to its extenstion, or NULL if + * Return pointer within filename to its extension, or NULL if * filename has no extension. * */ diff --git a/src/test_libFLAC/md5.c b/src/test_libFLAC/md5.c index 4b6edfed..147a76c8 100644 --- a/src/test_libFLAC/md5.c +++ b/src/test_libFLAC/md5.c @@ -169,7 +169,7 @@ static FLAC__bool test_md5_codec(void) FLAC__int32 arrays[MAX_CHANNEL_COUNT][MD5_SAMPLE_COUNT], *pointer[MAX_CHANNEL_COUNT], **signal; uint32_t chan, byte_size, seed = 0x12345679; - /* Set up signal data using a trival Linear Congruent PRNG. */ + /* Set up signal data using a trivial Linear Congruent PRNG. */ signal = &pointer[0]; for (chan = 0 ; chan < MAX_CHANNEL_COUNT ; chan ++) { uint32_t k; diff --git a/test/common.sh.in b/test/common.sh.in index 5f98cf22..0884bbc5 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -45,7 +45,7 @@ export LD_LIBRARY_PATH EXE=@EXEEXT@ -# Needed for bulding out-of-tree where source files are in the $top_srcdir tree +# Needed for building out-of-tree where source files are in the $top_srcdir tree # and build products in the $top_builddir tree. top_srcdir=@top_srcdir@ top_builddir=@top_builddir@ diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh index c40c0d3d..3af2741d 100755 --- a/test/test_grabbag.sh +++ b/test/test_grabbag.sh @@ -101,7 +101,7 @@ for cuesheet in $bad_cuesheets ; do done # -# positve tests +# positive tests # for cuesheet in $good_cuesheets ; do echo "POSITIVE $cuesheet" | sed "s|${top_srcdir}/test/||" >> $log 2>&1 |