Mercurial > libavformat.hg
changeset 2164:3804e39efbfd libavformat
misc spelling fixes
| author | diego |
|---|---|
| date | Tue, 12 Jun 2007 09:29:25 +0000 |
| parents | 6c0176688fae |
| children | eac986610f47 |
| files | asf.c avformat.h flvenc.c mov.c movenc.c mpeg.c nsvdec.c nut.c nut.h nutdec.c raw.c riff.c rtp.c swf.c utils.c |
| diffstat | 15 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/asf.c Tue Jun 12 08:06:54 2007 +0000 +++ b/asf.c Tue Jun 12 09:29:25 2007 +0000 @@ -413,7 +413,7 @@ 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){
--- a/avformat.h Tue Jun 12 08:06:54 2007 +0000 +++ b/avformat.h Tue Jun 12 09:29:25 2007 +0000 @@ -158,7 +158,7 @@ #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 @@ 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 @@ * * @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 @@ /** * 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 @@ * 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 @@ /** * 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 @@ 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.
--- a/flvenc.c Tue Jun 12 08:06:54 2007 +0000 +++ b/flvenc.c Tue Jun 12 09:29:25 2007 +0000 @@ -69,7 +69,7 @@ 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; }
--- a/mov.c Tue Jun 12 08:06:54 2007 +0000 +++ b/mov.c Tue Jun 12 09:29:25 2007 +0000 @@ -751,7 +751,7 @@ 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 @@ } 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);
--- a/movenc.c Tue Jun 12 08:06:54 2007 +0000 +++ b/movenc.c Tue Jun 12 09:29:25 2007 +0000 @@ -1182,7 +1182,7 @@ /* 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;
--- a/mpeg.c Tue Jun 12 08:06:54 2007 +0000 +++ b/mpeg.c Tue Jun 12 09:29:25 2007 +0000 @@ -822,7 +822,7 @@ 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)
--- a/nsvdec.c Tue Jun 12 08:06:54 2007 +0000 +++ b/nsvdec.c Tue Jun 12 09:29:25 2007 +0000 @@ -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 @@ { 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 }, };
--- a/nut.c Tue Jun 12 08:06:54 2007 +0000 +++ b/nut.c Tue Jun 12 09:29:25 2007 +0000 @@ -85,7 +85,7 @@ 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 @@ 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);
--- a/nut.h Tue Jun 12 08:06:54 2007 +0000 +++ b/nut.h Tue Jun 12 09:29:25 2007 +0000 @@ -63,7 +63,7 @@ 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 @@ // 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;
--- a/nutdec.c Tue Jun 12 08:06:54 2007 +0000 +++ b/nutdec.c Tue Jun 12 09:29:25 2007 +0000 @@ -116,7 +116,7 @@ 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 @@ 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);
--- a/raw.c Tue Jun 12 08:06:54 2007 +0000 +++ b/raw.c Tue Jun 12 09:29:25 2007 +0000 @@ -316,7 +316,7 @@ 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 ||
--- a/riff.c Tue Jun 12 08:06:54 2007 +0000 +++ b/riff.c Tue Jun 12 09:29:25 2007 +0000 @@ -329,7 +329,7 @@ } 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;
--- a/rtp.c Tue Jun 12 08:06:54 2007 +0000 +++ b/rtp.c Tue Jun 12 09:29:25 2007 +0000 @@ -515,7 +515,7 @@ 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;
--- a/swf.c Tue Jun 12 08:06:54 2007 +0000 +++ b/swf.c Tue Jun 12 09:29:25 2007 +0000 @@ -386,7 +386,7 @@ 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 */
--- a/utils.c Tue Jun 12 08:06:54 2007 +0000 +++ b/utils.c Tue Jun 12 09:29:25 2007 +0000 @@ -293,7 +293,7 @@ } #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 @@ 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 @@ 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; }