From 56cc85a068870cfa1c3bcc39c7e312b6a0fe8ca3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 2 Dec 2007 15:43:08 +0000 Subject: [PATCH] Misc spelling fixes, prefer American over British English. Originally committed as revision 11126 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Changelog | 2 +- Doxyfile | 2 +- libavcodec/ac3dec.c | 8 ++++---- libavcodec/armv4l/simple_idct_arm.S | 4 ++-- libavcodec/avcodec.h | 10 +++++----- libavcodec/i386/cavsdsp_mmx.c | 2 +- libavcodec/rv34data.h | 2 +- libavcodec/sparc/dsputil_vis.c | 2 +- libavcodec/vmnc.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Changelog b/Changelog index 81c4cacc8e..272275dce3 100644 --- a/Changelog +++ b/Changelog @@ -383,7 +383,7 @@ version 0.4.0: - added timeshifting support for live feeds (option ?date=xxx in the URL) - added high quality image resize code with polyphase filter (need - mmx/see optimisation). Enable multiple image size support in ffserver. + mmx/see optimization). Enable multiple image size support in ffserver. - added multi live feed support in ffserver - suppressed master feature from ffserver (it should be done with an external program which opens the .ffm url and writes it to another diff --git a/Doxyfile b/Doxyfile index 9e4fdcdd0f..31daf5d864 100644 --- a/Doxyfile +++ b/Doxyfile @@ -654,7 +654,7 @@ LATEX_BATCHMODE = NO #--------------------------------------------------------------------------- # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimised for Word 97 and may not look very pretty with +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 6fd1e479bf..2996881e7b 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -73,7 +73,7 @@ static const uint8_t qntztab[16] = { /** dynamic range table. converts codes to scale factors. */ static float dynrng_tab[256]; -/** dialogue normalization table */ +/** dialog normalization table */ static float dialnorm_tab[32]; /** Adjustments in dB gain */ @@ -161,7 +161,7 @@ typedef struct { int out_channels; ///< number of output channels float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients - float dialnorm[2]; ///< dialogue normalization + float dialnorm[2]; ///< dialog normalization float dynrng[2]; ///< dynamic range float cplco[AC3_MAX_CHANNELS][18]; ///< coupling coordinates int ncplbnd; ///< number of coupling bands @@ -276,7 +276,7 @@ static void ac3_tables_init(void) dynrng_tab[i] = powf(2.0f, v) * ((i & 0x1F) | 0x20); } - /* generate dialogue normalization table + /* generate dialog normalization table references: Section 5.4.2.8 dialnorm Section 7.6 Dialogue Normalization */ for(i=1; i<32; i++) { @@ -382,7 +382,7 @@ static int ac3_parse_header(AC3DecodeContext *ctx) /* read the rest of the bsi. read twice for dual mono mode. */ i = !(ctx->acmod); do { - ctx->dialnorm[i] = dialnorm_tab[get_bits(gb, 5)]; // dialogue normalization + ctx->dialnorm[i] = dialnorm_tab[get_bits(gb, 5)]; // dialog normalization if (get_bits1(gb)) skip_bits(gb, 8); //skip compression if (get_bits1(gb)) diff --git a/libavcodec/armv4l/simple_idct_arm.S b/libavcodec/armv4l/simple_idct_arm.S index 7b9a5b5a4b..98e9009709 100644 --- a/libavcodec/armv4l/simple_idct_arm.S +++ b/libavcodec/armv4l/simple_idct_arm.S @@ -79,7 +79,7 @@ simple_idct_ARM: __row_loop: - @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimise ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) + @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimize ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) ldr r1, [r14, #0] @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer) ldr r2, [r14, #4] @ R2=(int32)(R12)[1]=ROWr32[1] ldr r3, [r14, #8] @ R3=ROWr32[2] @@ -421,7 +421,7 @@ __end_a_evaluation2: @@ col[40] = ((a2 - b2) >> COL_SHIFT); @@ col[48] = ((a1 - b1) >> COL_SHIFT); @@ col[56] = ((a0 - b0) >> COL_SHIFT); - @@@@@ no optimisation here @@@@@ + @@@@@ no optimization here @@@@@ add r8, r6, r0 @ R8=a0+b0 add r9, r2, r1 @ R9=a1+b1 mov r8, r8, asr #COL_SHIFT diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a9ab710e55..a6aeac5475 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2039,11 +2039,11 @@ typedef struct AVCodecContext { * - decoding: unused */ int partitions; -#define X264_PART_I4X4 0x001 /* Analyse i4x4 */ -#define X264_PART_I8X8 0x002 /* Analyse i8x8 (requires 8x8 transform) */ -#define X264_PART_P8X8 0x010 /* Analyse p16x8, p8x16 and p8x8 */ -#define X264_PART_P4X4 0x020 /* Analyse p8x4, p4x8, p4x4 */ -#define X264_PART_B8X8 0x100 /* Analyse b16x8, b8x16 and b8x8 */ +#define X264_PART_I4X4 0x001 /* Analyze i4x4 */ +#define X264_PART_I8X8 0x002 /* Analyze i8x8 (requires 8x8 transform) */ +#define X264_PART_P8X8 0x010 /* Analyze p16x8, p8x16 and p8x8 */ +#define X264_PART_P4X4 0x020 /* Analyze p8x4, p4x8, p4x4 */ +#define X264_PART_B8X8 0x100 /* Analyze b16x8, b8x16 and b8x8 */ /** * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal) diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c index 2a7090a5eb..4a23d0bc60 100644 --- a/libavcodec/i386/cavsdsp_mmx.c +++ b/libavcodec/i386/cavsdsp_mmx.c @@ -2,7 +2,7 @@ * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Copyright (c) 2006 Stefan Gehrer * - * MMX optimized DSP functions, based on H.264 optimizations by + * MMX-optimized DSP functions, based on H.264 optimizations by * Michael Niedermayer and Loren Merritt * * This file is part of FFmpeg. diff --git a/libavcodec/rv34data.h b/libavcodec/rv34data.h index d044b2aa37..75ba37bb48 100644 --- a/libavcodec/rv34data.h +++ b/libavcodec/rv34data.h @@ -37,7 +37,7 @@ static const uint8_t rv34_count_ones[16] = { }; /** - * Values used to reconstruct coded block pattern. + * values used to reconstruct coded block pattern */ static const uint8_t rv34_cbp_code[16] = { 0x00, 0x20, 0x10, 0x30, 0x02, 0x22, 0x12, 0x32, diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index 0c88317415..4372603119 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -3999,7 +3999,7 @@ static int vis_level () /* libavcodec initialization code */ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx) { - /* VIS specific optimizations */ + /* VIS-specific optimizations */ int accel = vis_level (); if (accel & ACCEL_SPARC_VIS) { diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index bee31956d7..a003bcb3f7 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -169,7 +169,7 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy) } } -/* fill rectangle with given colour */ +/* fill rectangle with given color */ static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int h, int color, int bpp, int stride) { int i, j;