Misc spelling fixes, prefer American over British English.

Originally committed as revision 11126 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-12-02 15:43:08 +00:00
parent 737278c86a
commit 56cc85a068
9 changed files with 17 additions and 17 deletions

View File

@ -383,7 +383,7 @@ version 0.4.0:
- added timeshifting support for live feeds (option ?date=xxx in the - added timeshifting support for live feeds (option ?date=xxx in the
URL) URL)
- added high quality image resize code with polyphase filter (need - 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 - added multi live feed support in ffserver
- suppressed master feature from ffserver (it should be done with an - suppressed master feature from ffserver (it should be done with an
external program which opens the .ffm url and writes it to another external program which opens the .ffm url and writes it to another

View File

@ -654,7 +654,7 @@ LATEX_BATCHMODE = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output # 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. # other RTF readers or editors.
GENERATE_RTF = NO GENERATE_RTF = NO

View File

@ -73,7 +73,7 @@ static const uint8_t qntztab[16] = {
/** dynamic range table. converts codes to scale factors. */ /** dynamic range table. converts codes to scale factors. */
static float dynrng_tab[256]; static float dynrng_tab[256];
/** dialogue normalization table */ /** dialog normalization table */
static float dialnorm_tab[32]; static float dialnorm_tab[32];
/** Adjustments in dB gain */ /** Adjustments in dB gain */
@ -161,7 +161,7 @@ typedef struct {
int out_channels; ///< number of output channels int out_channels; ///< number of output channels
float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients 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 dynrng[2]; ///< dynamic range
float cplco[AC3_MAX_CHANNELS][18]; ///< coupling coordinates float cplco[AC3_MAX_CHANNELS][18]; ///< coupling coordinates
int ncplbnd; ///< number of coupling bands 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); 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 references: Section 5.4.2.8 dialnorm
Section 7.6 Dialogue Normalization */ Section 7.6 Dialogue Normalization */
for(i=1; i<32; i++) { 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. */ /* read the rest of the bsi. read twice for dual mono mode. */
i = !(ctx->acmod); i = !(ctx->acmod);
do { 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)) if (get_bits1(gb))
skip_bits(gb, 8); //skip compression skip_bits(gb, 8); //skip compression
if (get_bits1(gb)) if (get_bits1(gb))

View File

@ -79,7 +79,7 @@ simple_idct_ARM:
__row_loop: __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 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 r2, [r14, #4] @ R2=(int32)(R12)[1]=ROWr32[1]
ldr r3, [r14, #8] @ R3=ROWr32[2] ldr r3, [r14, #8] @ R3=ROWr32[2]
@ -421,7 +421,7 @@ __end_a_evaluation2:
@@ col[40] = ((a2 - b2) >> COL_SHIFT); @@ col[40] = ((a2 - b2) >> COL_SHIFT);
@@ col[48] = ((a1 - b1) >> COL_SHIFT); @@ col[48] = ((a1 - b1) >> COL_SHIFT);
@@ col[56] = ((a0 - b0) >> COL_SHIFT); @@ col[56] = ((a0 - b0) >> COL_SHIFT);
@@@@@ no optimisation here @@@@@ @@@@@ no optimization here @@@@@
add r8, r6, r0 @ R8=a0+b0 add r8, r6, r0 @ R8=a0+b0
add r9, r2, r1 @ R9=a1+b1 add r9, r2, r1 @ R9=a1+b1
mov r8, r8, asr #COL_SHIFT mov r8, r8, asr #COL_SHIFT

View File

@ -2039,11 +2039,11 @@ typedef struct AVCodecContext {
* - decoding: unused * - decoding: unused
*/ */
int partitions; int partitions;
#define X264_PART_I4X4 0x001 /* Analyse i4x4 */ #define X264_PART_I4X4 0x001 /* Analyze i4x4 */
#define X264_PART_I8X8 0x002 /* Analyse i8x8 (requires 8x8 transform) */ #define X264_PART_I8X8 0x002 /* Analyze i8x8 (requires 8x8 transform) */
#define X264_PART_P8X8 0x010 /* Analyse p16x8, p8x16 and p8x8 */ #define X264_PART_P8X8 0x010 /* Analyze p16x8, p8x16 and p8x8 */
#define X264_PART_P4X4 0x020 /* Analyse p8x4, p4x8, p4x4 */ #define X264_PART_P4X4 0x020 /* Analyze p8x4, p4x8, p4x4 */
#define X264_PART_B8X8 0x100 /* Analyse b16x8, b8x16 and b8x8 */ #define X264_PART_B8X8 0x100 /* Analyze b16x8, b8x16 and b8x8 */
/** /**
* direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal) * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal)

View File

@ -2,7 +2,7 @@
* Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Chinese AVS video (AVS1-P2, JiZhun profile) decoder.
* Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de> * Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de>
* *
* 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 * Michael Niedermayer and Loren Merritt
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

View File

@ -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] = { static const uint8_t rv34_cbp_code[16] = {
0x00, 0x20, 0x10, 0x30, 0x02, 0x22, 0x12, 0x32, 0x00, 0x20, 0x10, 0x30, 0x02, 0x22, 0x12, 0x32,

View File

@ -3999,7 +3999,7 @@ static int vis_level ()
/* libavcodec initialization code */ /* libavcodec initialization code */
void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx) void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx)
{ {
/* VIS specific optimizations */ /* VIS-specific optimizations */
int accel = vis_level (); int accel = vis_level ();
if (accel & ACCEL_SPARC_VIS) { if (accel & ACCEL_SPARC_VIS) {

View File

@ -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) 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; int i, j;