From 5e53486545726987ab4482321d4dcf7e23e7652f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 13 Feb 2008 09:26:10 +0000 Subject: [PATCH] typo fix: inited --> initialized Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/allcodecs.c | 6 +++--- libavcodec/dca.c | 12 ++++++------ libavcodec/error_resilience.c | 2 +- libavcodec/imgconvert.c | 6 +++--- libavcodec/mpc7.c | 6 +++--- libavcodec/mpc8.c | 6 +++--- libavcodec/mpegaudiodec.c | 2 +- libavcodec/msmpeg4.c | 6 +++--- libavcodec/qdm2.c | 6 +++--- libavcodec/utils.c | 6 +++--- libavcodec/vc1.c | 8 ++++---- libavcodec/vp3.c | 10 +++++----- libavdevice/alldevices.c | 6 +++--- libavformat/allformats.c | 6 +++--- libavformat/nutdec.c | 6 +++--- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 6e42b06020..9bb35fa977 100644 --- 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 e4aff9602c..2a449a2030 100644 --- 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 1fd9474d74..17f04d5abb 100644 --- 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 69bad5000f..14d4791fa9 100644 --- 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 14e5c11516..37bdb5f390 100644 --- 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 b211503112..3dfa5c9f32 100644 --- 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 75903e950a..98f7f3b5ec 100644 --- 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 8ca17c99d8..0ffcc6040f 100644 --- 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 01a4940a47..55ddbef45d 100644 --- 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 77dfd0fc7a..bb0e5e2ea2 100644 --- 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 db746b1ae7..80eaca6916 100644 --- 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 92258d1395..6cb7fbe143 100644 --- 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 f97dc73d91..0334be8c57 100644 --- 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 be27055801..5cafd6209d 100644 --- 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 1519a652c3..b637bb4f4b 100644 --- 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 */