aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2014-07-12 22:10:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-12 22:33:27 +0200
commit39a6e02fd4651f8300b2bbadffd5299452e00424 (patch)
treeef4f9480eaf9f335243d20a536d739f04a82bc5a
parent4470a3eeafa97d20b1e68a6b40490f71da726adf (diff)
downloadffmpeg-39a6e02fd4651f8300b2bbadffd5299452e00424.tar.gz
fix spelling errors
Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/filters.texi2
-rw-r--r--libavcodec/tiff_common.h10
-rw-r--r--libavfilter/x86/yadif-16.asm2
-rw-r--r--libavutil/downmix_info.h2
-rw-r--r--libavutil/dynarray.h2
-rw-r--r--libavutil/frame.h2
-rw-r--r--libavutil/utils.c2
-rw-r--r--libswresample/swresample_internal.h2
-rw-r--r--libswscale/swscale_internal.h2
9 files changed, 13 insertions, 13 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index b736b3fe31..f4f66f42ca 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3324,7 +3324,7 @@ The option available in this filter is:
@item cycle
Specify the length of the window over which the judder repeats.
-Accepts any interger greater than 1. Useful values are:
+Accepts any integer greater than 1. Useful values are:
@table @samp
@item 4
diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h
index 16c9e50850..03558c31a3 100644
--- a/libavcodec/tiff_common.h
+++ b/libavcodec/tiff_common.h
@@ -67,16 +67,16 @@ static const uint16_t ifd_tags[] = {
*/
int ff_tis_ifd(unsigned tag);
-/** Reads a short from the bytestream using given endianess. */
+/** Reads a short from the bytestream using given endianness. */
unsigned ff_tget_short(GetByteContext *gb, int le);
-/** Reads a long from the bytestream using given endianess. */
+/** Reads a long from the bytestream using given endianness. */
unsigned ff_tget_long(GetByteContext *gb, int le);
-/** Reads a double from the bytestream using given endianess. */
+/** Reads a double from the bytestream using given endianness. */
double ff_tget_double(GetByteContext *gb, int le);
-/** Reads a byte from the bytestream using given endianess. */
+/** Reads a byte from the bytestream using given endianness. */
unsigned ff_tget(GetByteContext *gb, int type, int le);
/** Returns an allocated string containing count
@@ -136,7 +136,7 @@ int ff_tadd_string_metadata(int count, const char *name,
GetByteContext *gb, int le, AVDictionary **metadata);
/** Decodes a TIFF header from the input bytestream
- * and sets the endianess in *le and the offset to
+ * and sets the endianness in *le and the offset to
* the first IFD in *ifd_offset accordingly.
*/
int ff_tdecode_header(GetByteContext *gb, int *le, int *ifd_offset);
diff --git a/libavfilter/x86/yadif-16.asm b/libavfilter/x86/yadif-16.asm
index a65da8902e..79d127dfaa 100644
--- a/libavfilter/x86/yadif-16.asm
+++ b/libavfilter/x86/yadif-16.asm
@@ -139,7 +139,7 @@ SECTION .text
; This version of CHECK2 has 3 fewer instructions on sets older than SSE4 but I
; am not sure whether it is any faster. A rewrite or refactor of the filter
-; code should make it possible to eliminate the move intruction at the end. It
+; code should make it possible to eliminate the move instruction at the end. It
; exists to satisfy the expectation that the "score" values are in m1.
; %macro CHECK2 0
diff --git a/libavutil/downmix_info.h b/libavutil/downmix_info.h
index 2fb9387a8d..221cf5bf9b 100644
--- a/libavutil/downmix_info.h
+++ b/libavutil/downmix_info.h
@@ -100,7 +100,7 @@ typedef struct AVDownmixInfo {
* @param frame the frame for which the side data is to be obtained or created
*
* @return the AVDownmixInfo structure to be edited by the caller, or NULL if
- * the sturcture cannot be allocated.
+ * the structure cannot be allocated.
*/
AVDownmixInfo *av_downmix_info_update_side_data(AVFrame *frame);
diff --git a/libavutil/dynarray.h b/libavutil/dynarray.h
index 00b19bc2a7..4947d93dc8 100644
--- a/libavutil/dynarray.h
+++ b/libavutil/dynarray.h
@@ -35,7 +35,7 @@
* the type of the size
* @param av_elt_size size of the elements in the array, in bytes
* @param av_array pointer to the array, must be a lvalue
- * @param av_size size of the array, must be an interger lvalue
+ * @param av_size size of the array, must be an integer lvalue
* @param av_success statement to execute on success; at this point, the
* size variable is not yet incremented
* @param av_failure statement to execute on failure; if this happens, the
diff --git a/libavutil/frame.h b/libavutil/frame.h
index c23e5af8d5..a39c8d07ff 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -214,7 +214,7 @@ typedef struct AVFrame {
int64_t pkt_pts;
/**
- * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isnt used)
+ * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used)
* This is also the Presentation time of this AVFrame calculated from
* only AVPacket.dts values without pts values.
*/
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 6c9b493a8f..aafd3b909e 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -40,7 +40,7 @@ unsigned avutil_version(void)
av_assert0(LIBAVUTIL_VERSION_MICRO >= 100);
av_assert0(HAVE_MMX2 == HAVE_MMXEXT);
- av_assert0(((size_t)-1) > 0); // C gurantees this but if false on a platform we care about revert at least b284e1ffe343d6697fb950d1ee517bafda8a9844
+ av_assert0(((size_t)-1) > 0); // C guarantees this but if false on a platform we care about revert at least b284e1ffe343d6697fb950d1ee517bafda8a9844
if (av_sat_dadd32(1, 2) != 5) {
av_log(NULL, AV_LOG_FATAL, "Libavutil has been build with a broken binutils, please upgrade binutils and rebuild\n");
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index 9edfdc8868..be4b321f70 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -62,7 +62,7 @@ struct DitherContext {
float ns_coeffs[NS_TAPS]; ///< Noise shaping filter coefficients
float ns_errors[SWR_CH_MAX][2*NS_TAPS];
AudioData noise; ///< noise used for dithering
- AudioData temp; ///< temporary storage when writing into the input buffer isnt possible
+ AudioData temp; ///< temporary storage when writing into the input buffer isn't possible
int output_sample_bits; ///< the number of used output bits, needed to scale dither correctly
};
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 8cf431733a..8d2d56acb7 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -429,7 +429,7 @@ typedef struct SwsContext {
#define UV_OFF_BYTE "11*8+4*4*"AV_STRINGIFY(MAX_FILTER_SIZE)"*3+56"
#define DITHER16 "11*8+4*4*"AV_STRINGIFY(MAX_FILTER_SIZE)"*3+64"
#define DITHER32 "11*8+4*4*"AV_STRINGIFY(MAX_FILTER_SIZE)"*3+80"
-#define DITHER32_INT (11*8+4*4*MAX_FILTER_SIZE*3+80) // value equal to above, used for checking that the struct hasnt been changed by mistake
+#define DITHER32_INT (11*8+4*4*MAX_FILTER_SIZE*3+80) // value equal to above, used for checking that the struct hasn't been changed by mistake
DECLARE_ALIGNED(8, uint64_t, redDither);
DECLARE_ALIGNED(8, uint64_t, greenDither);