diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-10-05 16:12:42 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-12-11 03:32:25 +0400 |
commit | da9cea77e314dad2fbc615a76085a0c330741f92 (patch) | |
tree | 7ddbdbf1749d1ee7c66c83f76f66bd50367b246d /libavformat | |
parent | 2e87b4c51152e0241cae7f655d53920029a0e632 (diff) |
Fix a bunch of common typos.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 7 | ||||
-rw-r--r-- | libavformat/flvenc.c | 4 | ||||
-rw-r--r-- | libavformat/id3v2.c | 2 | ||||
-rw-r--r-- | libavformat/img2.c | 2 | ||||
-rw-r--r-- | libavformat/iv8.c | 2 | ||||
-rw-r--r-- | libavformat/mms.h | 2 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/mpegts.c | 8 | ||||
-rw-r--r-- | libavformat/mpegtsenc.c | 2 | ||||
-rw-r--r-- | libavformat/mxfenc.c | 2 | ||||
-rw-r--r-- | libavformat/rdt.c | 2 | ||||
-rw-r--r-- | libavformat/rtp.h | 2 | ||||
-rw-r--r-- | libavformat/udp.c | 2 | ||||
-rw-r--r-- | libavformat/utils.c | 4 |
14 files changed, 22 insertions, 21 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ab1cd3fcf1..eff60094b1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -685,7 +685,8 @@ typedef struct AVStream { /** * last packet in packet_buffer for this stream when muxing. - * used internally, NOT PART OF PUBLIC API, dont read or write from outside of libav* + * Used internally, NOT PART OF PUBLIC API, do not read or + * write from outside of libav* */ struct AVPacketList *last_in_packet_buffer; #endif @@ -709,7 +710,7 @@ typedef struct AVStream { int codec_info_nb_frames; /** - * Stream informations used internally by av_find_stream_info() + * Stream information used internally by av_find_stream_info() */ #define MAX_STD_TIMEBASES (60*12+5) struct { @@ -877,7 +878,7 @@ typedef struct AVFormatContext { /** * Decoding: duration of the stream, in AV_TIME_BASE fractional * seconds. Only set this value if you know none of the individual stream - * durations and also dont set any of them. This is deduced from the + * durations and also do not set any of them. This is deduced from the * AVStream values if not set. */ int64_t duration; diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index d349ffdd70..84466aa8a0 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -361,7 +361,7 @@ static int flv_write_trailer(AVFormatContext *s) file_size = avio_tell(pb); - /* update informations */ + /* update information */ avio_seek(pb, flv->duration_offset, SEEK_SET); put_amf_double(pb, flv->duration / (double)1000); avio_seek(pb, flv->filesize_offset, SEEK_SET); @@ -412,7 +412,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } if (enc->codec_id == CODEC_ID_H264) { - /* check if extradata looks like mp4 formated */ + /* check if extradata looks like MP4 */ if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) { if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0) return -1; diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 92f25901e5..deb652d60c 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -142,7 +142,7 @@ static void free_geobtag(void *obj) * @param maxread Pointer to maximum number of characters to read from the * AVIOContext. After execution the value is decremented by the number of bytes * actually read. - * @returns 0 if no error occured, dst is uninitialized on error + * @returns 0 if no error occurred, dst is uninitialized on error */ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, uint8_t **dst, int *maxread) diff --git a/libavformat/img2.c b/libavformat/img2.c index 898e6a4ca4..2af561c2ce 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -432,7 +432,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) (!st->codec->extradata_size && AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature error: - av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n"); + av_log(s, AV_LOG_ERROR, "malformed JPEG 2000 codestream\n"); return -1; } } diff --git a/libavformat/iv8.c b/libavformat/iv8.c index 78f71e82af..4f25441e8c 100644 --- a/libavformat/iv8.c +++ b/libavformat/iv8.c @@ -24,7 +24,7 @@ static int probe(AVProbeData *p) { - // the single file i have starts with that, i dont know if others do too + // the single file I have starts with that, I do not know if others do, too if( p->buf[0] == 1 && p->buf[1] == 1 && p->buf[2] == 3 diff --git a/libavformat/mms.h b/libavformat/mms.h index 36e772c7f9..5235581645 100644 --- a/libavformat/mms.h +++ b/libavformat/mms.h @@ -33,7 +33,7 @@ typedef struct { /** Buffer for outgoing packets. */ /*@{*/ - uint8_t *write_out_ptr; ///< Pointer for writting the buffer. + uint8_t *write_out_ptr; ///< Pointer for writing the buffer. uint8_t out_buffer[512]; ///< Buffer for outgoing packet. /*@}*/ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 36a799d728..09932f83fb 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -243,7 +243,7 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track) /** * This function writes extradata "as is". - * Extradata must be formated like a valid atom (with size and tag) + * Extradata must be formatted like a valid atom (with size and tag). */ static int mov_write_extradata_tag(AVIOContext *pb, MOVTrack *track) { diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index f7045cee5e..37ffae9f66 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -456,7 +456,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end) return c; } -/* read and allocate a DVB string preceeded by its length */ +/* read and allocate a DVB string preceded by its length */ static char *getstr8(const uint8_t **pp, const uint8_t *p_end) { int len; @@ -1672,7 +1672,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) return 0; p = packet + 4; if (has_adaptation) { - /* skip adapation field */ + /* skip adaptation field */ p += p[0] + 1; } /* if past the end of packet, ignore */ @@ -1750,7 +1750,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size) len = avio_read(pb, buf, TS_PACKET_SIZE); if (len != TS_PACKET_SIZE) return len < 0 ? len : AVERROR_EOF; - /* check paquet sync byte */ + /* check packet sync byte */ if (buf[0] != 0x47) { /* find a new packet start */ avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR); @@ -1892,7 +1892,7 @@ static int mpegts_read_header(AVFormatContext *s, if (s->iformat == &ff_mpegts_demuxer) { /* normal demux */ - /* first do a scaning to get all the services */ + /* first do a scan to get all the services */ if (pb->seekable && avio_seek(pb, pos, SEEK_SET) < 0) av_log(s, AV_LOG_ERROR, "Unable to seek back to the start\n"); diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index c36c672053..32a759c55b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -944,7 +944,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) uint32_t state = -1; if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { - av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, " + av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, " "no startcode found, use -vbsf h264_mp4toannexb\n"); return -1; } diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index a7eb432759..78d3650e03 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -68,7 +68,7 @@ typedef struct { int index; ///< index in mxf_essence_container_uls table const UID *codec_ul; int order; ///< interleaving order if dts are equal - int interlaced; ///< wether picture is interlaced + int interlaced; ///< whether picture is interlaced int temporal_reordering; AVRational aspect_ratio; ///< display aspect ratio int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing diff --git a/libavformat/rdt.c b/libavformat/rdt.c index f492805d13..c06583e105 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -484,7 +484,7 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st, * is set and once for if it isn't. We only read the first because we * don't care much (that's what the "odd" variable is for). * Each rule contains a set of one or more statements, optionally - * preceeded by a single condition. If there's a condition, the rule + * preceded by a single condition. If there's a condition, the rule * starts with a '#'. Multiple conditions are merged between brackets, * so there are never multiple conditions spread out over separate * statements. Generally, these conditions are bitrate limits (min/max) diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 4f35142afd..e619008007 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -72,7 +72,7 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type); #define RTP_VERSION 2 #define RTP_MAX_SDES 256 /**< maximum text length for SDES */ -/* RTCP paquets use 0.5 % of the bandwidth */ +/* RTCP packets use 0.5% of the bandwidth */ #define RTCP_TX_RATIO_NUM 5 #define RTCP_TX_RATIO_DEN 1000 diff --git a/libavformat/udp.c b/libavformat/udp.c index 529114a860..2bdd3dc773 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -372,7 +372,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) goto fail; /* Follow the requested reuse option, unless it's multicast in which - * case enable reuse unless explicitely disabled. + * case enable reuse unless explicitly disabled. */ if (s->reuse_socket || (s->is_multicast && !reuse_specified)) { s->reuse_socket = 1; diff --git a/libavformat/utils.c b/libavformat/utils.c index 1df042f0fe..8b749ad7fc 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -770,7 +770,7 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ - //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes + //FIXME we do not reduce score to 0 for the case of running out of buffer space in bytes set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0); if(st->codec->codec_id != CODEC_ID_PROBE){ pd->buf_size=0; @@ -1081,7 +1081,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]); if(pkt->dts == AV_NOPTS_VALUE) pkt->dts= st->pts_buffer[0]; - if(st->codec->codec_id == CODEC_ID_H264){ //we skiped it above so we try here + if(st->codec->codec_id == CODEC_ID_H264){ // we skipped it above so we try here update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet } if(pkt->dts > st->cur_dts) |