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 /libavformat | |
| parent | 30bd40f2f1d89dbab96b1060f581fd95651dd156 (diff) | |
| download | ffmpeg-f4433de9ef53b78397c58828e9bf84fb59160aed.tar.gz | |
consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index a312670d29..96b411b869 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 311f29f49f..4f5068af4e 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 a115fe5710..5e77654587 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 30f065bb81..ca81ff8e34 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 3a3525d969..881c347c22 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 */ } |