diff options
author | Diego Biurrun <diego@biurrun.de> | 2008-05-26 23:14:25 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-05-26 23:14:25 +0000 |
commit | f4433de9ef53b78397c58828e9bf84fb59160aed (patch) | |
tree | 0ef2ba182ff661d189bfa98b524ff27ca1d18d16 | |
parent | 30bd40f2f1d89dbab96b1060f581fd95651dd156 (diff) | |
download | ffmpeg-streaming-f4433de9ef53b78397c58828e9bf84fb59160aed.zip ffmpeg-streaming-f4433de9ef53b78397c58828e9bf84fb59160aed.tar.gz |
consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/acelp_vectors.h | 2 | ||||
-rw-r--r-- | libavcodec/cook.c | 2 | ||||
-rw-r--r-- | libavcodec/dnxhdenc.c | 2 | ||||
-rw-r--r-- | libavcodec/h264.c | 2 | ||||
-rw-r--r-- | libavcodec/qdm2.c | 4 | ||||
-rw-r--r-- | libavcodec/qtrle.c | 8 | ||||
-rw-r--r-- | libavcodec/vc1.c | 4 | ||||
-rw-r--r-- | libavcodec/vp3.c | 14 | ||||
-rw-r--r-- | libavcodec/vqavideo.c | 2 | ||||
-rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
-rw-r--r-- | libavformat/avidec.c | 2 | ||||
-rw-r--r-- | libavformat/ipmovie.c | 2 | ||||
-rw-r--r-- | libavformat/nsvdec.c | 2 | ||||
-rw-r--r-- | libavformat/rl2.c | 2 | ||||
-rw-r--r-- | libavformat/rmenc.c | 2 |
15 files changed, 26 insertions, 26 deletions
diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index b7dcf6d..53901a9 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -105,7 +105,7 @@ extern const uint8_t ff_fc_2pulses_9bits_track2_gray[32]; * \param fc_v [out] decoded fixed codebook vector (2.13) * \param tab1 table used for first pulse_count pulses * \param tab2 table used for last pulse - * \param pulse_indices fixed codebook indeces + * \param pulse_indices fixed codebook indexes * \param pulse_signs signs of the excitation pulses (0 bit value * means negative sign) * \param bits number of bits per one pulse index diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 9384fc3..3b7a4fd 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -349,7 +349,7 @@ static int cook_decode_close(AVCodecContext *avctx) * Fill the gain array for the timedomain quantization. * * @param q pointer to the COOKContext - * @param gaininfo[9] array of gain indices + * @param gaininfo[9] array of gain indexes */ static void decode_gain_info(GetBitContext *gb, int *gaininfo) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index f96ed3a..ae529fe 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -47,7 +47,7 @@ typedef struct DNXHDEncContext { AVFrame frame; int cid; const CIDEntry *cid_table; - uint8_t *msip; ///< Macroblock Scan Indices Payload + uint8_t *msip; ///< Macroblock Scan Indexes Payload uint32_t *slice_size; struct DNXHDEncContext *thread[MAX_THREADS]; diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c6fe739..28ff1af 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6505,7 +6505,7 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 int dir; /* FIXME: A given frame may occupy more than one position in * the reference list. So ref2frm should be populated with - * frame numbers, not indices. */ + * frame numbers, not indexes. */ static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31}; diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 399585f..114b978 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1431,7 +1431,7 @@ static void qdm2_decode_fft_packets (QDM2Context *q) if (q->sub_packet_list_B[0].packet == NULL) return; - /* reset minimum indices for FFT coefficients */ + /* reset minimum indexes for FFT coefficients */ q->fft_coefs_index = 0; for (i=0; i < 5; i++) q->fft_coefs_min_index[i] = -1; @@ -1481,7 +1481,7 @@ static void qdm2_decode_fft_packets (QDM2Context *q) } } // Loop on B packets - /* calculate maximum indices for FFT coefficients */ + /* calculate maximum indexes for FFT coefficients */ for (i = 0, j = -1; i < 5; i++) if (q->fft_coefs_min_index[i] >= 0) { if (j >= 0) diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 939ceac..4b0f38f 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -79,7 +79,7 @@ static void qtrle_decode_4bpp(QtrleContext *s) int rle_code; int row_ptr, pixel_ptr; int row_inc = s->frame.linesize[0]; - unsigned char pi1, pi2, pi3, pi4, pi5, pi6, pi7, pi8; /* 8 palette indices */ + unsigned char pi1, pi2, pi3, pi4, pi5, pi6, pi7, pi8; /* 8 palette indexes */ unsigned char *rgb = s->frame.data[0]; int pixel_limit = s->frame.linesize[0] * s->avctx->height; @@ -122,7 +122,7 @@ static void qtrle_decode_4bpp(QtrleContext *s) /* decode the run length code */ rle_code = -rle_code; /* get the next 4 bytes from the stream, treat them as palette - * indices, and output them rle_code times */ + * indexes, and output them rle_code times */ CHECK_STREAM_PTR(4); pi1 = ((s->buf[stream_ptr]) >> 4) & 0x0f; pi2 = (s->buf[stream_ptr++]) & 0x0f; @@ -170,7 +170,7 @@ static void qtrle_decode_8bpp(QtrleContext *s) int rle_code; int row_ptr, pixel_ptr; int row_inc = s->frame.linesize[0]; - unsigned char pi1, pi2, pi3, pi4; /* 4 palette indices */ + unsigned char pi1, pi2, pi3, pi4; /* 4 palette indexes */ unsigned char *rgb = s->frame.data[0]; int pixel_limit = s->frame.linesize[0] * s->avctx->height; @@ -213,7 +213,7 @@ static void qtrle_decode_8bpp(QtrleContext *s) /* decode the run length code */ rle_code = -rle_code; /* get the next 4 bytes from the stream, treat them as palette - * indices, and output them rle_code times */ + * indexes, and output them rle_code times */ CHECK_STREAM_PTR(4); pi1 = s->buf[stream_ptr++]; pi2 = s->buf[stream_ptr++]; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index c4cac00..8549e39 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -3017,7 +3017,7 @@ static int vc1_decode_p_mb(VC1Context *v) offset_table[6] = { 0, 1, 3, 7, 15, 31 }; int mb_has_coeffs = 1; /* last_flag */ int dmv_x, dmv_y; /* Differential MV components */ - int index, index1; /* LUT indices */ + int index, index1; /* LUT indexes */ int val, sign; /* temp values */ int first_block = 1; int dst_idx, off; @@ -3246,7 +3246,7 @@ static void vc1_decode_b_mb(VC1Context *v) static const int size_table[6] = { 0, 2, 3, 4, 5, 8 }, offset_table[6] = { 0, 1, 3, 7, 15, 31 }; int mb_has_coeffs = 0; /* last_flag */ - int index, index1; /* LUT indices */ + int index, index1; /* LUT indexes */ int val, sign; /* temp values */ int first_block = 1; int dst_idx, off; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index a73abe5..0f395c4 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -269,7 +269,7 @@ typedef struct Vp3DecodeContext { uint8_t qr_size [2][3][64]; uint16_t qr_base[2][3][64]; - /* this is a list of indices into the all_fragments array indicating + /* this is a list of indexes into the all_fragments array indicating * which of the fragments are coded */ int *coded_fragment_list; int coded_fragment_list_index; @@ -291,19 +291,19 @@ typedef struct Vp3DecodeContext { DECLARE_ALIGNED_16(int16_t, qmat[2][4][64]); //<qmat[is_inter][plane] /* This table contains superblock_count * 16 entries. Each set of 16 - * numbers corresponds to the fragment indices 0..15 of the superblock. + * numbers corresponds to the fragment indexes 0..15 of the superblock. * An entry will be -1 to indicate that no entry corresponds to that * index. */ int *superblock_fragments; /* This table contains superblock_count * 4 entries. Each set of 4 - * numbers corresponds to the macroblock indices 0..3 of the superblock. + * numbers corresponds to the macroblock indexes 0..3 of the superblock. * An entry will be -1 to indicate that no entry corresponds to that * index. */ int *superblock_macroblocks; /* This table contains macroblock_count * 6 entries. Each set of 6 - * numbers corresponds to the fragment indices 0..5 which comprise + * numbers corresponds to the fragment indexes 0..5 which comprise * the macroblock (4 Y fragments and 2 C fragments). */ int *macroblock_fragments; /* This is an array that indicates how a particular macroblock @@ -1223,7 +1223,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) int ac_c_table; int residual_eob_run = 0; - /* fetch the DC table indices */ + /* fetch the DC table indexes */ dc_y_table = get_bits(gb, 4); dc_c_table = get_bits(gb, 4); @@ -1239,7 +1239,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); - /* fetch the AC table indices */ + /* fetch the AC table indexes */ ac_y_table = get_bits(gb, 4); ac_c_table = get_bits(gb, 4); @@ -1331,7 +1331,7 @@ static void reverse_dc_prediction(Vp3DecodeContext *s, /* DC values for the left, up-left, up, and up-right fragments */ int vl, vul, vu, vur; - /* indices for the left, up-left, up, and up-right fragments */ + /* indexes for the left, up-left, up, and up-right fragments */ int l, ul, u, ur; /* diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 8a8f604..3455fe7 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -54,7 +54,7 @@ * file. This is an interesting technique, although it makes random file * seeking difficult despite the fact that the frames are all intracoded. * - * V1,2 VQA uses 12-bit codebook indices. If the 12-bit indices were + * V1,2 VQA uses 12-bit codebook indexes. If the 12-bit indexes were * packed into bytes and then RLE compressed, bytewise, the results would * be poor. That is why the coding method divides each index into 2 parts, * the top 4 bits and the bottom 8 bits, then RL encodes the 4-bit pieces diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b660be7..6f6c411 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -421,7 +421,7 @@ struct AVFilterContext /** * A link between two filters. This contains pointers to the source and - * destination filters between which this link exists, and the indices of + * destination filters between which this link exists, and the indexes of * the pads involved. In addition, this link also contains the parameters * which have been negotiated and agreed upon between the filter, such as * image dimensions, format, etc diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a312670..96b411b 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -996,7 +996,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp if (ENABLE_DV_DEMUXER && avi->dv_demux) { /* One and only one real stream for DV in AVI, and it has video */ - /* offsets. Calling with other stream indices should have failed */ + /* offsets. Calling with other stream indexes should have failed */ /* the av_index_search_timestamp call above. */ assert(stream_index == 0); diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 311f29f..4f5068a 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -446,7 +446,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, last_color = first_color + AV_RL16(&scratch[2]) - 1; /* sanity check (since they are 16 bit values) */ if ((first_color > 0xFF) || (last_color > 0xFF)) { - debug_ipmovie("demux_ipmovie: set_palette indices out of range (%d -> %d)\n", + debug_ipmovie("demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", first_color, last_color); chunk_type = CHUNK_BAD; break; diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index a115fe5..5e77654 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -140,7 +140,7 @@ struct nsv_pcm_header { #define TB_NSVF MKBETAG('N', 'S', 'V', 'f') #define TB_NSVS MKBETAG('N', 'S', 'V', 's') -/* hardcoded stream indices */ +/* hardcoded stream indexes */ #define NSV_ST_VIDEO 0 #define NSV_ST_AUDIO 1 #define NSV_ST_SUBT 2 diff --git a/libavformat/rl2.c b/libavformat/rl2.c index 30f065b..ca81ff8 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -42,7 +42,7 @@ #define RLV3_TAG MKBETAG('R', 'L', 'V', '3') typedef struct Rl2DemuxContext { - unsigned int index_pos[2]; ///< indices in the sample tables + unsigned int index_pos[2]; ///< indexes in the sample tables } Rl2DemuxContext; diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 3a3525d..881c347 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -408,7 +408,7 @@ static int rm_write_trailer(AVFormatContext *s) put_be16(pb, 0); for(i=0;i<s->nb_streams;i++) { - put_be32(pb, 0); /* zero indices */ + put_be32(pb, 0); /* zero indexes */ put_be16(pb, i); /* stream number */ put_be32(pb, 0); /* next index */ } |