diff options
author | Diego Biurrun <diego@biurrun.de> | 2008-03-10 18:42:09 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-03-10 18:42:09 +0000 |
commit | 7ce6892373c812e9fff7af2f8107e6ee3d0567b0 (patch) | |
tree | a6271df5a1ed1996c7017f5105cc15d6793f628c | |
parent | 06de58d2a862f1a8f536527d1f659170a62ba978 (diff) | |
download | ffmpeg-7ce6892373c812e9fff7af2f8107e6ee3d0567b0.tar.gz |
misc spelling fixes
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
-rw-r--r-- | libavcodec/dsputil.h | 13 | ||||
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 2 | ||||
-rw-r--r-- | libavformat/mov.c | 6 | ||||
-rw-r--r-- | libavformat/nutenc.c | 6 | ||||
-rw-r--r-- | libavutil/aes.h | 4 | ||||
-rw-r--r-- | libavutil/avutil.h | 2 | ||||
-rw-r--r-- | libavutil/bswap.h | 2 | ||||
-rw-r--r-- | libavutil/common.h | 2 | ||||
-rw-r--r-- | libavutil/mem.c | 4 | ||||
-rw-r--r-- | libpostproc/postprocess.h | 2 |
12 files changed, 25 insertions, 22 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cbc6f70a79..f3c1a8b355 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -296,7 +296,7 @@ enum CodecID { CODEC_ID_SSA, CODEC_ID_MOV_TEXT, - /* other specific kind of codecs (generaly used for attachments) */ + /* other specific kind of codecs (generally used for attachments) */ CODEC_ID_TTF= 0x18000, CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 07ac23f2e8..3e60e9d3ba 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -93,11 +93,14 @@ void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height); /* minimum alignment rules ;) -if u notice errors in the align stuff, need more alignment for some asm code for some cpu -or need to use a function with less aligned data then send a mail to the ffmpeg-dev list, ... - -!warning these alignments might not match reallity, (missing attribute((align)) stuff somewhere possible) -i (michael) didnt check them, these are just the alignents which i think could be reached easily ... +If you notice errors in the align stuff, need more alignment for some ASM code +for some CPU or need to use a function with less aligned data then send a mail +to the ffmpeg-devel mailing list, ... + +!warning These alignments might not match reality, (missing attribute((align)) +stuff somewhere possible). +I (Michael) did not check them, these are just the alignments which i think +could be reached easily ... !future video codecs might need functions with less strict alignment */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 284a1ad30b..ab3673ebb9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -425,7 +425,7 @@ int MPV_encode_init(AVCodecContext *avctx) } if(s->avctx->scenechange_threshold < 1000000000 && (s->flags & CODEC_FLAG_CLOSED_GOP)){ - av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet, set threshold to 1000000000\n"); + av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection are not supported yet, set threshold to 1000000000\n"); return -1; } diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index a2ba5e1251..0c56cfb9b7 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -197,7 +197,7 @@ int dct_quantize_altivec(MpegEncContext* s, // z4 = vec_add(z4, z5); // z4 += z5; // z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */ - // Wow! It's actually more effecient to roll this multiply + // Wow! It's actually more efficient to roll this multiply // into the adds below, even thought the multiply gets done twice! // z2 = vec_madd(z2, vec_2_562915447, (vector float)zero); diff --git a/libavformat/mov.c b/libavformat/mov.c index a67604b0e0..2c46523373 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -665,9 +665,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id : st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) ){ - /* multiple fourcc, we skip jpeg, this isnt correct, we should export it as - seperate AVStream but this needs a few changes in the mov demuxer, patch - welcome */ + /* Multiple fourcc, we skip JPEG. This is not correct, we should + * export it as a separate AVStream but this needs a few changes + * in the MOV demuxer, patch welcome. */ url_fskip(pb, size - (url_ftell(pb) - start_pos)); continue; } diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 0ec4b1fb33..ae1bbb59a8 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -69,7 +69,7 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint header |= 1<<16; //no crc AV_WB32(out, header); if(size <= 0) - return 2; //we guess theres no crc, if there is one the user clearly doesnt care about overhead + return 2; //we guess there is no crc, if there is one the user clearly does not care about overhead if(bitrate_index == 30) return -1; //something is wrong ... @@ -78,8 +78,8 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint header |= (bitrate_index&1)<<9; return 2; //FIXME actually put the needed ones in build_elision_headers() - return 3; //we guess that the private bit isnt set -//FIXME the above asumtations should be checked, if these turn out false too often something should be done + return 3; //we guess that the private bit is not set +//FIXME the above assumptions should be checked, if these turn out false too often something should be done } return 0; } diff --git a/libavutil/aes.h b/libavutil/aes.h index 438ba170e4..25efdf4d64 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -28,14 +28,14 @@ extern const int av_aes_size; struct AVAES; /** - * initializes an AVAES context + * Initializes an AVAES context. * @param key_bits 128, 192 or 256 * @param decrypt 0 for encryption, 1 for decryption */ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); /** - * encrypts / decrypts. + * Encrypts / decrypts. * @param count number of 16 byte blocks * @param dst destination array, can be equal to src * @param src source array, can be equal to dst diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 3d2bd4be28..1e84557cda 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -23,7 +23,7 @@ /** * @file avutil.h - * external api header. + * external API header */ diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 8a0df7a875..2f04cd4fdd 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -20,7 +20,7 @@ /** * @file bswap.h - * byte swap. + * byte swapping routines */ #ifndef FFMPEG_BSWAP_H diff --git a/libavutil/common.h b/libavutil/common.h index ce017b0908..fd1d00c7b3 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -20,7 +20,7 @@ /** * @file common.h - * common internal and external api header. + * common internal and external API header */ #ifndef FFMPEG_COMMON_H diff --git a/libavutil/mem.c b/libavutil/mem.c index 2444759681..436f846458 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -69,10 +69,10 @@ void *av_malloc(unsigned int size) But I don't want to code such logic here! */ /* Why 16? - because some cpus need alignment, for example SSE2 on P4, & most RISC cpus + Because some CPUs need alignment, for example SSE2 on P4, & most RISC CPUs it will just trigger an exception and the unaligned load will be done in the exception handler or it will just segfault (SSE2 on P4) - Why not larger? because i didnt see a difference in benchmarks ... + Why not larger? because i did not see a difference in benchmarks ... */ /* benchmarks with p3 memalign(64)+1 3071,3051,3032 diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index 818fb41bab..eb55b6d004 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -24,7 +24,7 @@ /** * @file postprocess.h * @brief - * external api for the pp stuff + * external postprocessing API */ #include "libavutil/avutil.h" |