diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-06-12 09:29:25 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-06-12 09:29:25 +0000 |
commit | 755bfeabccbba9ae1b565b11d645b8e4fe139fa8 (patch) | |
tree | dbd398273c82bc49803b6143e6942e86dd3f3d25 /libavformat | |
parent | 26ef3220cf6ad4a3cb1580086c244394f5aa3094 (diff) | |
download | ffmpeg-755bfeabccbba9ae1b565b11d645b8e4fe139fa8.tar.gz |
misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/asf.c | 2 | ||||
-rw-r--r-- | libavformat/avformat.h | 18 | ||||
-rw-r--r-- | libavformat/flvenc.c | 2 | ||||
-rw-r--r-- | libavformat/mov.c | 4 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/mpeg.c | 2 | ||||
-rw-r--r-- | libavformat/nsvdec.c | 4 | ||||
-rw-r--r-- | libavformat/nut.c | 4 | ||||
-rw-r--r-- | libavformat/nut.h | 4 | ||||
-rw-r--r-- | libavformat/nutdec.c | 4 | ||||
-rw-r--r-- | libavformat/raw.c | 2 | ||||
-rw-r--r-- | libavformat/riff.c | 2 | ||||
-rw-r--r-- | libavformat/rtp.c | 2 | ||||
-rw-r--r-- | libavformat/swf.c | 2 | ||||
-rw-r--r-- | libavformat/utils.c | 6 |
15 files changed, 30 insertions, 30 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index e8dce18d31..223651986e 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -413,7 +413,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) get_str16_nolen(pb, name_len, name, sizeof(name)); //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); - value_num= get_le16(pb);//we should use get_value() here but it doesnt work 2 is le16 here but le32 elsewhere + value_num= get_le16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere url_fskip(pb, value_len - 2); if(stream_num<128){ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 0fda3d9147..cb9b8b83c8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -158,7 +158,7 @@ typedef struct AVFormatParameters { #define AVFMT_RAWPICTURE 0x0020 /**< format wants AVPicture structure for raw picture data */ #define AVFMT_GLOBALHEADER 0x0040 /**< format wants global header */ -#define AVFMT_NOTIMESTAMPS 0x0080 /**< format doesnt need / has any timestamps */ +#define AVFMT_NOTIMESTAMPS 0x0080 /**< format does not need / have any timestamps */ #define AVFMT_GENERIC_INDEX 0x0100 /**< use generic index building code */ typedef struct AVOutputFormat { @@ -295,10 +295,10 @@ typedef struct AVStream { int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ /* ffmpeg.c private use */ int stream_copy; /**< if set, just copy stream */ - enum AVDiscard discard; ///< selects which packets can be discarded at will and dont need to be demuxed + enum AVDiscard discard; ///< selects which packets can be discarded at will and do not need to be demuxed //FIXME move stuff to a flags field? /** quality, as it has been removed from AVCodecContext and put in AVVideoFrame - * MN:dunno if thats the right place, for it */ + * MN: dunno if that is the right place for it */ float quality; /** decoding: pts of the first frame of the stream, in stream time base. */ int64_t start_time; @@ -546,7 +546,7 @@ AVFormatContext *av_alloc_format_context(void); * * @param ic media file handle * @return >=0 if OK. AVERROR_xxx if error. - * @todo let user decide somehow what information is needed so we dont waste time geting stuff the user doesnt need + * @todo Let user decide somehow what information is needed so we do not waste time geting stuff the user does not need. */ int av_find_stream_info(AVFormatContext *ic); @@ -666,7 +666,7 @@ int av_add_index_entry(AVStream *st, /** * Does a binary search using av_index_search_timestamp() and AVCodec.read_timestamp(). - * this isnt supposed to be called directly by a user application, but by demuxers + * This is not supposed to be called directly by a user application, but by demuxers. * @param target_ts target timestamp in the time base of the given stream * @param stream_index stream number */ @@ -676,7 +676,7 @@ int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts * Updates cur_dts of all streams based on given timestamp and AVStream. * * Stream ref_st unchanged, others set cur_dts in their native timebase - * only needed for timestamp wrapping or if (dts not set and pts!=dts) + * only needed for timestamp wrapping or if (dts not set and pts!=dts). * @param timestamp new dts expressed in time_base of param ref_st * @param ref_st reference stream giving time_base of param timestamp */ @@ -684,7 +684,7 @@ void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp); /** * Does a binary search using read_timestamp(). - * this isnt supposed to be called directly by a user application, but by demuxers + * This is not supposed to be called directly by a user application, but by demuxers. * @param target_ts target timestamp in the time base of the given stream * @param stream_index stream number */ @@ -694,8 +694,8 @@ int64_t av_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts, i int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap); /** - * allocate the stream private data and write the stream header to an - * output media file + * Allocate the stream private data and write the stream header to an + * output media file. * * @param s media file handle * @return 0 if OK. AVERROR_xxx if error. diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index ece585d772..614f7814da 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -69,7 +69,7 @@ static int get_audio_flags(AVCodecContext *enc){ flags |= FLV_SAMPLERATE_SPECIAL; break; default: - av_log(enc, AV_LOG_ERROR, "flv doesnt support that sample rate, choose from (44100, 22050, 11025)\n"); + av_log(enc, AV_LOG_ERROR, "flv does not support that sample rate, choose from (44100, 22050, 11025).\n"); return -1; } diff --git a/libavformat/mov.c b/libavformat/mov.c index 37a91ff42d..e23fbe3390 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -751,7 +751,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) break; } - //Read QT version 1 fields. In version 0 theese dont exist + //Read QT version 1 fields. In version 0 these do not exist. dprintf(c->fc, "version =%d, isom =%d\n",version,c->isom); if(!c->isom) { if(version==1) { @@ -1423,7 +1423,7 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) } for(i=0; i<mov->total_streams; i++) { - /* dont need those anymore */ + /* Do not need those anymore. */ av_freep(&mov->streams[i]->chunk_offsets); av_freep(&mov->streams[i]->sample_to_chunk); av_freep(&mov->streams[i]->sample_sizes); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 293b3b3f33..a8ab8f9063 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1182,7 +1182,7 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov, /* iTunes meta data */ mov_write_meta_tag(pb, mov, s); - if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff isnt valid in mp4 + if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 /* Requirements */ for (i=0; i<mov->nb_streams; i++) { if(mov->tracks[i].entry <= 0) continue; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index d30fc53fc9..e9da33c55a 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -822,7 +822,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index, stuffing_size = payload_size - av_fifo_size(&stream->fifo); - // first byte doesnt fit -> reset pts/dts + stuffing + // first byte does not fit -> reset pts/dts + stuffing if(payload_size <= trailer_size && pts != AV_NOPTS_VALUE){ int timestamp_len=0; if(dts != pts) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 85bb69a676..d0ba839edc 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -91,7 +91,7 @@ struct NSVf_header { uint32_t chunk_tag; /* 'NSVf' */ uint32_t chunk_size; - uint32_t file_size; /* max 4GB ??? noone learns anything it seems :^) */ + uint32_t file_size; /* max 4GB ??? no one learns anything it seems :^) */ uint32_t file_length; //unknown1; /* what about MSB of file_size ? */ uint32_t info_strings_size; /* size of the info strings */ //unknown2; uint32_t table_entries; @@ -197,7 +197,7 @@ static const AVCodecTag nsv_codec_video_tags[] = { { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, */ - { CODEC_ID_XVID, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ + { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, { 0, 0 }, }; diff --git a/libavformat/nut.c b/libavformat/nut.c index 995149951d..867f86fa35 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -85,7 +85,7 @@ typedef struct { int64_t packet_start[3]; //0-> startcode less, 1-> short startcode 2-> long startcodes FrameCode frame_code[256]; unsigned int stream_count; - uint64_t next_startcode; ///< stores the next startcode if it has alraedy been parsed but the stream isnt seekable + uint64_t next_startcode; ///< stores the next startcode if it has already been parsed but the stream is not seekable StreamContext *stream; int max_distance; int max_short_distance; @@ -359,7 +359,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ uint64_t state=0; if(pos >= 0) - url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream isnt seekable, but that shouldnt matter, as in this case we simply start where we are currently + url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream is not seekable, but that should not matter, as in this case we simply start where we are currently while(!url_feof(bc)){ state= (state<<8) | get_byte(bc); diff --git a/libavformat/nut.h b/libavformat/nut.h index 82bbf6f178..1a4473789c 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -63,7 +63,7 @@ typedef struct { uint16_t size_lsb; int16_t pts_delta; uint8_t reserved_count; -} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to java style but dont mix +} FrameCode; // maybe s/FrameCode/framecode_t/ or change all to Java style but do not mix typedef struct { int last_flags; @@ -81,7 +81,7 @@ typedef struct { // int written_packet_size; // int64_t packet_start[3]; //0-> startcode less, 1-> short startcode 2-> long startcodes FrameCode frame_code[256]; - uint64_t next_startcode; ///< stores the next startcode if it has alraedy been parsed but the stream isnt seekable + uint64_t next_startcode; ///< stores the next startcode if it has already been parsed but the stream is not seekable StreamContext *stream; unsigned int max_distance; unsigned int time_base_count; diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8688f19717..158e84f7eb 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -116,7 +116,7 @@ static uint64_t find_any_startcode(ByteIOContext *bc, int64_t pos){ uint64_t state=0; if(pos >= 0) - url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream isnt seekable, but that shouldnt matter, as in this case we simply start where we are currently + url_fseek(bc, pos, SEEK_SET); //note, this may fail if the stream is not seekable, but that should not matter, as in this case we simply start where we are currently while(!url_feof(bc)){ state= (state<<8) | get_byte(bc); @@ -836,7 +836,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag next_node[0]->back_ptr, next_node[1]->back_ptr, flags, &ts, nut_read_timestamp); if(pos2>=0) pos= pos2; - //FIXME dir but i think it doesnt matter + //FIXME dir but i think it does not matter } dummy.pos= pos; sp= av_tree_find(nut->syncpoints, &dummy, sp_pos_cmp, NULL); diff --git a/libavformat/raw.c b/libavformat/raw.c index 1332928e60..c98ae73c2b 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -316,7 +316,7 @@ static int video_read_header(AVFormatContext *s, st->need_parsing = AVSTREAM_PARSE_FULL; /* for mjpeg, specify frame rate */ - /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/ + /* for mpeg4 specify it too (most mpeg4 streams do not have the fixed_vop_rate set ...)*/ if (ap->time_base.num) { av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den); } else if ( st->codec->codec_id == CODEC_ID_MJPEG || diff --git a/libavformat/riff.c b/libavformat/riff.c index af3e7145c5..2e95f377e2 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -329,7 +329,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) } if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) { - blkalign = enc->frame_size; //this is wrong, but seems many demuxers dont work if this is set correctly + blkalign = enc->frame_size; //this is wrong, but it seems many demuxers do not work if this is set correctly //blkalign = 144 * enc->bit_rate/enc->sample_rate; } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { // blkalign = 1; diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 67ab41da0f..2f6a387414 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -515,7 +515,7 @@ static int rtp_parse_mp4_au(RTPDemuxContext *s, const uint8_t *buf) infos->au_headers = av_malloc(sizeof(struct AUHeaders) * infos->nb_au_headers); /* XXX: We handle multiple AU Section as only one (need to fix this for interleaving) - In my test, the faad decoder doesnt behave correctly when sending each AU one by one + In my test, the FAAD decoder does not behave correctly when sending each AU one by one but does when sending the whole as one big packet... */ infos->au_headers[0].size = 0; infos->au_headers[0].index = 0; diff --git a/libavformat/swf.c b/libavformat/swf.c index eaf2e8d754..ca4befec01 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -386,7 +386,7 @@ static int swf_write_header(AVFormatContext *s) break; default: /* not supported */ - av_log(s, AV_LOG_ERROR, "swf doesnt support that sample rate, choose from (44100, 22050, 11025)\n"); + av_log(s, AV_LOG_ERROR, "swf does not support that sample rate, choose from (44100, 22050, 11025).\n"); return -1; } v |= 0x02; /* 16 bit playback */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 54cb3a40c8..0fa5d8d502 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -293,7 +293,7 @@ static const char* format_to_name(void* ptr) } #define OFFSET(x) offsetof(AVFormatContext,x) -#define DEFAULT 0 //should be NAN but it doesnt work as its not a constant in glibc as required by ANSI/ISO C +#define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C //these names are too long to be readable #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM @@ -632,7 +632,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (delay && pc && pc->pict_type != FF_B_TYPE) presentation_delayed = 1; - /* this may be redundant, but it shouldnt hurt */ + /* This may be redundant, but it should not hurt. */ if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts) presentation_delayed = 1; @@ -992,7 +992,7 @@ int av_add_index_entry(AVStream *st, return -1; memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index)); st->nb_index_entries++; - }else if(ie->pos == pos && distance < ie->min_distance) //dont reduce the distance + }else if(ie->pos == pos && distance < ie->min_distance) //do not reduce the distance distance= ie->min_distance; } |