misc typo and wording fixes

9 files changed, 12 insertions, 12 deletions

diff --git a/libavcodec/anm.c b/libavcodec/anm.c
index 831cdfb9ac..b86b7c0ffb 100644
--- a/libavcodec/anm.c
+++ b/libavcodec/anm.c
@@ -65,8 +65,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
  * @return non-zero if destination buffer is exhausted
  *
  * a copy operation is achieved when 'gb' is set
- * a fill operation is acheived when 'gb' is null and pixel is >= 0
- * a skip operation is acheived when 'gb' is null and pixel is < 0
+ * a fill operation is achieved when 'gb' is null and pixel is >= 0
+ * a skip operation is achieved when 'gb' is null and pixel is < 0
  */
 static inline int op(uint8_t **dst, const uint8_t *dst_end,
                      GetByteContext *gb,
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index e54ae69831..77980e02f8 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -548,9 +548,9 @@ typedef struct DSPContext {
      * @param src  source array
      *             constraints: 16-byte aligned
      * @param min  minimum value
-     *             constraints: must in the the range [-(1<<24), 1<<24]
+     *             constraints: must be in the range [-(1 << 24), 1 << 24]
      * @param max  maximum value
-     *             constraints: must in the the range [-(1<<24), 1<<24]
+     *             constraints: must be in the range [-(1 << 24), 1 << 24]
      * @param len  number of elements in the array
      *             constraints: multiple of 32 greater than zero
      */
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 025a0dd156..2d6a08e032 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1744,7 +1744,7 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
     }
 
     top_border = h->top_borders[top_idx][s->mb_x];
-    /* There are two lines saved, the line above the the top macroblock
+    /* There are two lines saved, the line above the top macroblock
      * of a pair, and the line above the bottom macroblock. */
     AV_COPY128(top_border, src_y + 16 * linesize);
     if (pixel_shift)
@@ -4375,7 +4375,7 @@ again:
                 if (ff_h264_decode_seq_parameter_set(h) < 0 &&
                     h->is_avc && (nalsize != consumed) && nalsize) {
                     av_log(h->s.avctx, AV_LOG_DEBUG,
-                           "SPS decoding failure, try parsing the coomplete NAL\n");
+                           "SPS decoding failure, trying again with the complete NAL\n");
                     init_get_bits(&s->gb, buf + buf_index + 1 - consumed,
                                   8 * (nalsize - 1));
                     ff_h264_decode_seq_parameter_set(h);
diff --git a/libavcodec/version.h b/libavcodec/version.h
index f42aebe2bb..1e189f6390 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,7 +41,7 @@
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
 
 /**
- * Those FF_API_* defines are not part of public API.
+ * These FF_API_* defines are not part of the public API.
  * They may change, break or disappear at any time.
  */
 #ifndef FF_API_REQUEST_CHANNELS
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index cdec161c80..1f77e4efca 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -147,7 +147,7 @@ struct xvmc_pix_fmt {
     */
     int             filled_mv_blocks_num;
 
-    /** Number of the the next free data block; one data block consists of
+    /** Number of the next free data block; one data block consists of
         64 short values in the data_blocks array.
         All blocks before this one have already been claimed by placing their
         position into the corresponding block description structure field,
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 0f4353fea9..56ebc27dfd 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -41,7 +41,7 @@
 #define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
 
 /**
- * Those FF_API_* defines are not part of public API.
+ * These FF_API_* defines are not part of the public API.
  * They may change, break or disappear at any time.
  */
 #ifndef FF_API_AVFILTERPAD_PUBLIC
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index e9f87782fa..0ffe18fd84 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -77,7 +77,7 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
 #define RTCP_TX_RATIO_DEN 1000
 
 /* An arbitrary id value for RTP Xiph streams - only relevant to indicate
- * the the configuration has changed within a stream (by changing the
+ * that the configuration has changed within a stream (by changing the
  * ident value sent).
  */
 #define RTP_XIPH_IDENT 0xfecdba
diff --git a/libavformat/version.h b/libavformat/version.h
index e2fa56188b..26bb2c596e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -44,7 +44,7 @@
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 
 /**
- * Those FF_API_* defines are not part of public API.
+ * These FF_API_* defines are not part of the public API.
  * They may change, break or disappear at any time.
  */
 #ifndef FF_API_CLOSE_INPUT_FILE
diff --git a/tools/patcheck b/tools/patcheck
index b3943c5d7c..78ca8246f7 100755
--- a/tools/patcheck
+++ b/tools/patcheck
@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^
 cat $TMP
 hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
 
-hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention)\b' 'common typos' $*
+hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b' 'common typos' $*
 
 hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
 hiegrep '[^sn]printf' 'Please use av_log' $*