diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-12-19 21:48:21 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-12-21 03:18:34 +0400 |
commit | 511cf612ac979f536fd65e14603a87ca5ad435f3 (patch) | |
tree | 44bef1bf9a062368bf4ab89485279549af8bda90 /libavformat | |
parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) |
miscellaneous typo fixes
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 2 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 2 | ||||
-rw-r--r-- | libavformat/dvenc.c | 6 | ||||
-rw-r--r-- | libavformat/hls.c | 2 | ||||
-rw-r--r-- | libavformat/hlsproto.c | 2 | ||||
-rw-r--r-- | libavformat/http.h | 2 | ||||
-rw-r--r-- | libavformat/rtpdec_jpeg.c | 2 | ||||
-rw-r--r-- | libavformat/smoothstreamingenc.c | 2 | ||||
-rw-r--r-- | libavformat/spdifenc.c | 2 | ||||
-rw-r--r-- | libavformat/wtv.c | 2 | ||||
-rw-r--r-- | libavformat/xmv.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 51635c4b84..149b66f1c9 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1532,7 +1532,7 @@ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, * @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 b762d10a2a..0da1e0579b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -368,7 +368,7 @@ static void fill_buffer(AVIOContext *s) 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/dvenc.c b/libavformat/dvenc.c index 27a444ea1f..a991cc6b0c 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -47,9 +47,9 @@ struct DVMuxContext { AVFifoBuffer *audio_data[2]; /* FIFO for storing excessive amounts of PCM */ int frames; /* current frame number */ int64_t start_time; /* recording start time */ - int has_audio; /* frame under contruction has audio */ - int has_video; /* frame under contruction has video */ - uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under contruction */ + int has_audio; /* frame under construction has audio */ + int has_video; /* frame under construction has video */ + uint8_t frame_buf[DV_MAX_FRAME_SIZE]; /* frame under construction */ }; static const int dv_aaux_packs_dist[12][9] = { diff --git a/libavformat/hls.c b/libavformat/hls.c index 1f6b7d56ed..4c0e0c0b63 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 179bdf1967..b750501c4d 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 3579ad745a..f0d9d4aea8 100644 --- a/libavformat/http.h +++ b/libavformat/http.h @@ -40,7 +40,7 @@ void ff_http_init_auth_state(URLContext *dest, const URLContext *src); * * @param h pointer to the ressource * @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_jpeg.c b/libavformat/rtpdec_jpeg.c index 9f73f7d5dc..25bb88d0d1 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -370,7 +370,7 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, /* Prepare the JPEG packet. */ if ((ret = ff_rtp_finalize_packet(pkt, &jpeg->frame, st->index)) < 0) { av_log(ctx, AV_LOG_ERROR, - "Error occured when getting frame buffer.\n"); + "Error occurred when getting frame buffer.\n"); return ret; } diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 1ed675a272..d26af0564b 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -51,7 +51,7 @@ typedef struct { char dirname[1024]; uint8_t iobuf[32768]; URLContext *out; // Current output stream where all output is written - URLContext *out2; // Auxillary output stream where all output also is written + URLContext *out2; // Auxiliary output stream where all output is also written URLContext *tail_out; // The actual main output stream, if we're currently seeked back to write elsewhere int64_t tail_pos, cur_pos, cur_start_pos; int packets_written; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 77af92e1f3..dcdabae1de 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -339,7 +339,7 @@ static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt) ctx->data_type = mpeg_data_type [version & 1][layer]; ctx->pkt_offset = spdif_mpeg_pkt_offset[version & 1][layer]; } - // TODO Data type dependant info (normal/karaoke, dynamic range control) + // TODO Data type dependent info (normal/karaoke, dynamic range control) return 0; } diff --git a/libavformat/wtv.c b/libavformat/wtv.c index 7bb421b0ce..2e5d39cff2 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -221,7 +221,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 5041c571c3..3f926eff9c 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -298,7 +298,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... |