typo fix: inited --> initialized

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11920 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 6e42b0602079af7cc039e47972f0c36bf80607b0..9bb35fa9770bf52027e1c96a2e161f05d5507775 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -53,11 +53,11 @@
  */
 void avcodec_register_all(void)
 {
-    static int inited;
+    static int initialized;
 
-    if (inited)
+    if (initialized)
         return;
-    inited = 1;
+    initialized = 1;
 
     /* video codecs */
     REGISTER_DECODER (AASC, aasc);

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index e4aff9602cb0fa08d39a5f30d08fd69d71c62916..2a449a20301b48911c3b81cb480c3023cc6e0b12 100644 (file)
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -179,10 +179,10 @@ typedef struct {
 
 static void dca_init_vlcs(void)
 {
-    static int vlcs_inited = 0;
+    static int vlcs_initialized = 0;
     int i, j;
 
-    if (vlcs_inited)
+    if (vlcs_initialized)
         return;
 
     dca_bitalloc_index.offset = 1;
@@ -214,7 +214,7 @@ static void dca_init_vlcs(void)
                      bitalloc_bits[i][j], 1, 1,
                      bitalloc_codes[i][j], 2, 2, 1);
         }
-    vlcs_inited = 1;
+    vlcs_initialized = 1;
 }
 
 static inline void get_array(GetBitContext *gb, int *dst, int len, int bits)
@@ -1195,9 +1195,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
 static void pre_calc_cosmod(DCAContext * s)
 {
     int i, j, k;
-    static int cosmod_inited = 0;
+    static int cosmod_initialized = 0;
 
-    if(cosmod_inited) return;
+    if(cosmod_initialized) return;
     for (j = 0, k = 0; k < 16; k++)
         for (i = 0; i < 16; i++)
             cos_mod[j++] = cos((2 * i + 1) * (2 * k + 1) * M_PI / 64);
@@ -1212,7 +1212,7 @@ static void pre_calc_cosmod(DCAContext * s)
     for (k = 0; k < 16; k++)
         cos_mod[j++] = -0.25 / (2.0 * sin((2 * k + 1) * M_PI / 128));
 
-    cosmod_inited = 1;
+    cosmod_initialized = 1;
 }
 
 

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 1fd9474d7444c770fbb898003727a9c3a52c245a..17f04d5abb815272e7f78324726c63eb60698e6f 100644 (file)
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -769,7 +769,7 @@ void ff_er_frame_end(MpegEncContext *s){
 
             if(   error2==(VP_START|DC_ERROR|AC_ERROR|MV_ERROR|AC_END|DC_END|MV_END)
                && error1!=(VP_START|DC_ERROR|AC_ERROR|MV_ERROR|AC_END|DC_END|MV_END)
-               && ((error1&AC_END) || (error1&DC_END) || (error1&MV_END))){ //end & uninited
+               && ((error1&AC_END) || (error1&DC_END) || (error1&MV_END))){ //end & uninit
                 end_ok=0;
             }
 

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 69bad5000fe181729680abe9165bcaa919e5a8dd..14d4791fa98740e6351d627f3f584485749201a1 100644 (file)
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -2350,7 +2350,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
                 const AVPicture *src, int src_pix_fmt,
                 int src_width, int src_height)
 {
-    static int inited;
+    static int initialized;
     int i, ret, dst_width, dst_height, int_pix_fmt;
     const PixFmtInfo *src_pix, *dst_pix;
     const ConvertEntry *ce;
@@ -2362,8 +2362,8 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
     if (src_width <= 0 || src_height <= 0)
         return 0;
 
-    if (!inited) {
-        inited = 1;
+    if (!initialized) {
+        initialized = 1;
         img_convert_init();
     }
 

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 14e5c11516e8a12799504987342655d406903809..37bdb5f390f488d9bcb0bbe4f3f9d4f74408039d 100644 (file)
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -50,7 +50,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
     MPCContext *c = avctx->priv_data;
     GetBitContext gb;
     uint8_t buf[16];
-    static int vlc_inited = 0;
+    static int vlc_initialized = 0;
 
     if(avctx->extradata_size < 16){
         av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
@@ -77,7 +77,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
             c->IS, c->MSS, c->gapless, c->lastframelen, c->maxbands);
     c->frames_to_skip = 0;
 
-    if(vlc_inited) return 0;
+    if(vlc_initialized) return 0;
     av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
     if(init_vlc(&scfi_vlc, MPC7_SCFI_BITS, MPC7_SCFI_SIZE,
                 &mpc7_scfi[1], 2, 1,
@@ -107,7 +107,7 @@ static int mpc7_decode_init(AVCodecContext * avctx)
             }
         }
     }
-    vlc_inited = 1;
+    vlc_initialized = 1;
     return 0;
 }
 

diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index b2115031128ab17d0932beac67e21c66339d929b..3dfa5c9f3213f303d170a93e932a63298fb48325 100644 (file)
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -97,7 +97,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
     int i;
     MPCContext *c = avctx->priv_data;
     GetBitContext gb;
-    static int vlc_inited = 0;
+    static int vlc_initialized = 0;
 
     if(avctx->extradata_size < 2){
         av_log(avctx, AV_LOG_ERROR, "Too small extradata size (%i)!\n", avctx->extradata_size);
@@ -117,7 +117,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
     c->MSS = get_bits1(&gb);
     c->frames = 1 << (get_bits(&gb, 3) * 2);
 
-    if(vlc_inited) return 0;
+    if(vlc_initialized) return 0;
     av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");
 
     init_vlc(&band_vlc, MPC8_BANDS_BITS, MPC8_BANDS_SIZE,
@@ -176,7 +176,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
                  &mpc8_q8_bits[i],  1, 1,
                  &mpc8_q8_codes[i], 1, 1, INIT_VLC_USE_STATIC);
     }
-    vlc_inited = 1;
+    vlc_initialized = 1;
     return 0;
 }
 

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 75903e950ae1945cb9a60db9290967e50e56e597..98f7f3b5ec499a662543c8f9621e77f704e8415a 100644 (file)
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2524,7 +2524,7 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
     /* Init the first mp3 decoder in standard way, so that all tables get builded
      * We replace avctx->priv_data with the context of the first decoder so that
      * decode_init() does not have to be changed.
-     * Other decoders will be inited here copying data from the first context
+     * Other decoders will be initialized here copying data from the first context
      */
     // Allocate zeroed memory for the first decoder context
     s->mp3decctx[0] = av_mallocz(sizeof(MPADecodeContext));

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 8ca17c99d8f20dfb749f624ff1888d80fdd52e79..0ffcc6040feb4ba5745912b09686368820d1aab6 100644 (file)
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -87,7 +87,7 @@ static uint8_t static_rl_table_store[NB_RL_TABLES][2][2*MAX_RUN + MAX_LEVEL + 3]
 
 static void common_init(MpegEncContext * s)
 {
-    static int inited=0;
+    static int initialized=0;
 
     switch(s->msmpeg4_version){
     case 1:
@@ -127,8 +127,8 @@ static void common_init(MpegEncContext * s)
     }
     //Note the default tables are set in common_init in mpegvideo.c
 
-    if(!inited){
-        inited=1;
+    if(!initialized){
+        initialized=1;
 
         init_h263_dc_for_msmpeg4();
     }

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 01a4940a47cd17f546662502e9493288a6d3427a..55ddbef45da8cdb7b7ae35914a1a540c11824f17 100644 (file)
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1692,11 +1692,11 @@ static void qdm2_synthesis_filter (QDM2Context *q, int index)
  * @param q    context
  */
 static void qdm2_init(QDM2Context *q) {
-    static int inited = 0;
+    static int initialized = 0;
 
-    if (inited != 0)
+    if (initialized != 0)
         return;
-    inited = 1;
+    initialized = 1;
 
     qdm2_init_vlc();
     ff_mpa_synth_init(mpa_window);

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 77dfd0fc7ad4c39dccb52166d90c0a13a0a4f153..bb0e5e2ea2f803df1cafccdc2f7acc25002a2456 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1254,11 +1254,11 @@ unsigned avcodec_build( void )
 
 void avcodec_init(void)
 {
-    static int inited = 0;
+    static int initialized = 0;
 
-    if (inited != 0)
+    if (initialized != 0)
         return;
-    inited = 1;
+    initialized = 1;
 
     dsputil_static_init();
 }

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index db746b1ae78c67d45747ed2cbf3ded37097bfdde..80eaca691654221886a5d43bc448cd7b75435d1d 100644 (file)
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -3867,7 +3867,7 @@ static int vc1_decode_init(AVCodecContext *avctx)
         const uint8_t *next;
         int size, buf2_size;
         uint8_t *buf2 = NULL;
-        int seq_inited = 0, ep_inited = 0;
+        int seq_initialized = 0, ep_initialized = 0;
 
         if(avctx->extradata_size < 16) {
             av_log(avctx, AV_LOG_ERROR, "Extradata size too small: %i\n", avctx->extradata_size);
@@ -3889,19 +3889,19 @@ static int vc1_decode_init(AVCodecContext *avctx)
                     av_free(buf2);
                     return -1;
                 }
-                seq_inited = 1;
+                seq_initialized = 1;
                 break;
             case VC1_CODE_ENTRYPOINT:
                 if(decode_entry_point(avctx, &gb) < 0){
                     av_free(buf2);
                     return -1;
                 }
-                ep_inited = 1;
+                ep_initialized = 1;
                 break;
             }
         }
         av_free(buf2);
-        if(!seq_inited || !ep_inited){
+        if(!seq_initialized || !ep_initialized){
             av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
             return -1;
         }

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 92258d1395f9be18de919648435c64c0f50d23ff..6cb7fbe14333c6651e80b51c777f66a533c2b18e 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -273,7 +273,7 @@ typedef struct Vp3DecodeContext {
      * which of the fragments are coded */
     int *coded_fragment_list;
     int coded_fragment_list_index;
-    int pixel_addresses_inited;
+    int pixel_addresses_initialized;
 
     VLC dc_vlc[16];
     VLC ac_vlc_1[16];
@@ -2009,7 +2009,7 @@ static int vp3_decode_init(AVCodecContext *avctx)
     s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
     s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
     s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
-    s->pixel_addresses_inited = 0;
+    s->pixel_addresses_initialized = 0;
 
     if (!s->theora_tables)
     {
@@ -2203,18 +2203,18 @@ static int vp3_decode_frame(AVCodecContext *avctx,
         s->current_frame= s->golden_frame;
 
         /* time to figure out pixel addresses? */
-        if (!s->pixel_addresses_inited)
+        if (!s->pixel_addresses_initialized)
         {
             if (!s->flipped_image)
                 vp3_calculate_pixel_addresses(s);
             else
                 theora_calculate_pixel_addresses(s);
-            s->pixel_addresses_inited = 1;
+            s->pixel_addresses_initialized = 1;
         }
     } else {
         /* allocate a new current frame */
         s->current_frame.reference = 3;
-        if (!s->pixel_addresses_inited) {
+        if (!s->pixel_addresses_initialized) {
             av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
             return -1;
         }

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index f97dc73d916c8152b51f0891a3646f9ab41fe952..0334be8c57057b308feb226db897c39fab2bcd73 100644 (file)
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -30,11 +30,11 @@
 
 void avdevice_register_all(void)
 {
-    static int inited;
+    static int initialized;
 
-    if (inited)
+    if (initialized)
         return;
-    inited = 1;
+    initialized = 1;
 
     /* devices */
     REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index be27055801e97c244eb35904c01a496cb1bed6b4..5cafd6209d47a17b4337dd2af1ad266373fd9e50 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -40,11 +40,11 @@
  */
 void av_register_all(void)
 {
-    static int inited;
+    static int initialized;
 
-    if (inited)
+    if (initialized)
         return;
-    inited = 1;
+    initialized = 1;
 
     avcodec_init();
     avcodec_register_all();

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 1519a652c32fcbed62ecdb8a27c21a4646a77b93..b637bb4f4b23c401527339d1a74bea03a89e51e6 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -531,7 +531,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
     NUTContext *nut = s->priv_data;
     ByteIOContext *bc = s->pb;
     int64_t pos;
-    int inited_stream_count;
+    int initialized_stream_count;
 
     nut->avf= s;
 
@@ -547,14 +547,14 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     /* stream headers */
     pos=0;
-    for(inited_stream_count=0; inited_stream_count < s->nb_streams;){
+    for(initialized_stream_count=0; initialized_stream_count < s->nb_streams;){
         pos= find_startcode(bc, STREAM_STARTCODE, pos)+1;
         if (pos<0+1){
             av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n");
             return -1;
         }
         if(decode_stream_header(nut) >= 0)
-            inited_stream_count++;
+            initialized_stream_count++;
     }
 
     /* info headers */