[FFmpeg-cvslog] r13444 - in trunk: libavcodec/acelp_vectors.h libavcodec/cook.c libavcodec/dnxhdenc.c libavcodec/h264.c libavcodec/qdm2.c libavcodec/qtrle.c libavcodec/vc1.c libavcodec/vp3.c libavcodec/vqavideo.c libavfilter/avfilter.h libavformat/avidec.c libavformat/ipmovie.c libavformat/nsvdec.c libavformat/rl2.c libavformat/rmenc.c
diego
subversion
Tue May 27 01:14:25 CEST 2008
Author: diego
Date: Tue May 27 01:14:25 2008
New Revision: 13444
Log:
consistency cosmetics: indices --> indexes
Modified:
trunk/libavcodec/acelp_vectors.h
trunk/libavcodec/cook.c
trunk/libavcodec/dnxhdenc.c
trunk/libavcodec/h264.c
trunk/libavcodec/qdm2.c
trunk/libavcodec/qtrle.c
trunk/libavcodec/vc1.c
trunk/libavcodec/vp3.c
trunk/libavcodec/vqavideo.c
trunk/libavfilter/avfilter.h
trunk/libavformat/avidec.c
trunk/libavformat/ipmovie.c
trunk/libavformat/nsvdec.c
trunk/libavformat/rl2.c
trunk/libavformat/rmenc.c
Modified: trunk/libavcodec/acelp_vectors.h
==============================================================================
--- trunk/libavcodec/acelp_vectors.h (original)
+++ trunk/libavcodec/acelp_vectors.h Tue May 27 01:14:25 2008
@@ -105,7 +105,7 @@ extern const uint8_t ff_fc_2pulses_9bits
* \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
Modified: trunk/libavcodec/cook.c
==============================================================================
--- trunk/libavcodec/cook.c (original)
+++ trunk/libavcodec/cook.c Tue May 27 01:14:25 2008
@@ -349,7 +349,7 @@ static int cook_decode_close(AVCodecCont
* 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)
Modified: trunk/libavcodec/dnxhdenc.c
==============================================================================
--- trunk/libavcodec/dnxhdenc.c (original)
+++ trunk/libavcodec/dnxhdenc.c Tue May 27 01:14:25 2008
@@ -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];
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c (original)
+++ trunk/libavcodec/h264.c Tue May 27 01:14:25 2008
@@ -6505,7 +6505,7 @@ static void filter_mb( H264Context *h, i
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};
Modified: trunk/libavcodec/qdm2.c
==============================================================================
--- trunk/libavcodec/qdm2.c (original)
+++ trunk/libavcodec/qdm2.c Tue May 27 01:14:25 2008
@@ -1431,7 +1431,7 @@ static void qdm2_decode_fft_packets (QDM
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 (QDM
}
} // 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)
Modified: trunk/libavcodec/qtrle.c
==============================================================================
--- trunk/libavcodec/qtrle.c (original)
+++ trunk/libavcodec/qtrle.c Tue May 27 01:14:25 2008
@@ -79,7 +79,7 @@ static void qtrle_decode_4bpp(QtrleConte
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(QtrleConte
/* 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(QtrleConte
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(QtrleConte
/* 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++];
Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c (original)
+++ trunk/libavcodec/vc1.c Tue May 27 01:14:25 2008
@@ -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 *
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;
Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c (original)
+++ trunk/libavcodec/vp3.c Tue May 27 01:14:25 2008
@@ -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(Vp3DecodeCo
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(Vp3DecodeCo
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(Vp3Dec
/* 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;
/*
Modified: trunk/libavcodec/vqavideo.c
==============================================================================
--- trunk/libavcodec/vqavideo.c (original)
+++ trunk/libavcodec/vqavideo.c Tue May 27 01:14:25 2008
@@ -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
Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h (original)
+++ trunk/libavfilter/avfilter.h Tue May 27 01:14:25 2008
@@ -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
Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c (original)
+++ trunk/libavformat/avidec.c Tue May 27 01:14:25 2008
@@ -996,7 +996,7 @@ static int avi_read_seek(AVFormatContext
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);
Modified: trunk/libavformat/ipmovie.c
==============================================================================
--- trunk/libavformat/ipmovie.c (original)
+++ trunk/libavformat/ipmovie.c Tue May 27 01:14:25 2008
@@ -446,7 +446,7 @@ static int process_ipmovie_chunk(IPMVECo
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;
Modified: trunk/libavformat/nsvdec.c
==============================================================================
--- trunk/libavformat/nsvdec.c (original)
+++ trunk/libavformat/nsvdec.c Tue May 27 01:14:25 2008
@@ -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
Modified: trunk/libavformat/rl2.c
==============================================================================
--- trunk/libavformat/rl2.c (original)
+++ trunk/libavformat/rl2.c Tue May 27 01:14:25 2008
@@ -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;
Modified: trunk/libavformat/rmenc.c
==============================================================================
--- trunk/libavformat/rmenc.c (original)
+++ trunk/libavformat/rmenc.c Tue May 27 01:14:25 2008
@@ -408,7 +408,7 @@ static int rm_write_trailer(AVFormatCont
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 */
}
More information about the ffmpeg-cvslog
mailing list