cosmetics: various spelling fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8 files changed, 10 insertions, 10 deletions

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 807c7ace7b..a435d516c6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -946,7 +946,7 @@ typedef struct AVFormatContext {
 #define AVFMT_FLAG_MP4A_LATM    0x8000 ///< Enable RTP MP4A-LATM payload
 #define AVFMT_FLAG_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
 #define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Dont merge side data but keep it separate.
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate.
 
     /**
      * decoding: size of data to probe; encoding: unused.
@@ -1739,7 +1739,7 @@ int av_get_output_timestamp(struct AVFormatContext *s, int stream,
  * @ingroup libavf
  * @{
  *
- * Miscelaneous utility functions related to both muxing and demuxing
+ * Miscellaneous utility functions related to both muxing and demuxing
  * (or neither).
  */
 
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 9154075701..05df00149b 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -389,7 +389,7 @@ static void fill_buffer(AVIOContext *s)
     int len= s->buffer_size - (dst - s->buffer);
     int max_buffer_size = s->max_packet_size ? s->max_packet_size : IO_BUFFER_SIZE;
 
-    /* can't fill the buffer without read_packet, just set EOF if appropiate */
+    /* can't fill the buffer without read_packet, just set EOF if appropriate */
     if (!s->read_packet && s->buf_ptr >= s->buf_end)
         s->eof_reached = 1;
 
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 1449f40bc6..a51a616d38 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -42,7 +42,7 @@
  * An apple http stream consists of a playlist with media segment files,
  * played sequentially. There may be several playlists with the same
  * video content, in different bandwidth variants, that are played in
- * parallel (preferrably only one bandwidth variant at a time). In this case,
+ * parallel (preferably only one bandwidth variant at a time). In this case,
  * the user supplied the url to a main playlist that only lists the variant
  * playlists.
  *
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c
index 95bd047877..a290c888e0 100644
--- a/libavformat/hlsproto.c
+++ b/libavformat/hlsproto.c
@@ -36,7 +36,7 @@
  * An apple http stream consists of a playlist with media segment files,
  * played sequentially. There may be several playlists with the same
  * video content, in different bandwidth variants, that are played in
- * parallel (preferrably only one bandwidth variant at a time). In this case,
+ * parallel (preferably only one bandwidth variant at a time). In this case,
  * the user supplied the url to a main playlist that only lists the variant
  * playlists.
  *
diff --git a/libavformat/http.h b/libavformat/http.h
index aaedbd6835..a19ad8ed3e 100644
--- a/libavformat/http.h
+++ b/libavformat/http.h
@@ -38,9 +38,9 @@ void ff_http_init_auth_state(URLContext *dest, const URLContext *src);
 /**
  * Send a new HTTP request, reusing the old connection.
  *
- * @param h pointer to the ressource
+ * @param h pointer to the resource
  * @param uri uri used to perform the request
- * @return a negative value if an error condition occured, 0
+ * @return a negative value if an error condition occurred, 0
  * otherwise
  */
 int ff_http_do_new_request(URLContext *h, const char *uri);
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index b11cc79842..ab405c0bf6 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -138,7 +138,7 @@ static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf)
 
     init_get_bits(&getbitcontext, buf, data->au_headers_length_bytes * 8);
 
-    /* XXX: Wrong if optionnal additional sections are present (cts, dts etc...) */
+    /* XXX: Wrong if optional additional sections are present (cts, dts etc...) */
     au_header_size = data->sizelength + data->indexlength;
     if (au_header_size <= 0 || (au_headers_length % au_header_size != 0))
         return -1;
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index bbd7c23724..b21b0970f2 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -208,7 +208,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int
     }
     wf->length = length;
 
-    /* seek to intial sector */
+    /* seek to initial sector */
     wf->position = 0;
     if (avio_seek(s->pb, (int64_t)wf->sectors[0] << WTV_SECTOR_BITS, SEEK_SET) < 0) {
         av_free(wf->sectors);
diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index cb61e153b1..b4accdf1cd 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -295,7 +295,7 @@ static int xmv_process_packet_header(AVFormatContext *s)
      * short for every audio track. But as playing around with XMV files with
      * ADPCM audio showed, taking the extra 4 bytes from the audio data gives
      * you either completely distorted audio or click (when skipping the
-     * remaining 68 bytes of the ADPCM block). Substracting 4 bytes for every
+     * remaining 68 bytes of the ADPCM block). Subtracting 4 bytes for every
      * audio track from the video data works at least for the audio. Probably
      * some alignment thing?
      * The video data has (always?) lots of padding, so it should work out...