Mercurial > libavcodec.hg
changeset 6350:8e63d869a904 libavcodec
typo fix: inited --> initialized
| author | diego |
|---|---|
| date | Wed, 13 Feb 2008 09:26:10 +0000 |
| parents | aed237dd11d8 |
| children | b568fe642948 |
| files | allcodecs.c dca.c error_resilience.c imgconvert.c mpc7.c mpc8.c mpegaudiodec.c msmpeg4.c qdm2.c utils.c vc1.c vp3.c |
| diffstat | 12 files changed, 38 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/allcodecs.c Wed Feb 13 08:05:51 2008 +0000 +++ b/allcodecs.c Wed Feb 13 09:26:10 2008 +0000 @@ -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);
--- a/dca.c Wed Feb 13 08:05:51 2008 +0000 +++ b/dca.c Wed Feb 13 09:26:10 2008 +0000 @@ -179,10 +179,10 @@ 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 @@ 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 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 @@ 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; }
--- a/error_resilience.c Wed Feb 13 08:05:51 2008 +0000 +++ b/error_resilience.c Wed Feb 13 09:26:10 2008 +0000 @@ -769,7 +769,7 @@ 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; }
--- a/imgconvert.c Wed Feb 13 08:05:51 2008 +0000 +++ b/imgconvert.c Wed Feb 13 09:26:10 2008 +0000 @@ -2350,7 +2350,7 @@ 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 @@ if (src_width <= 0 || src_height <= 0) return 0; - if (!inited) { - inited = 1; + if (!initialized) { + initialized = 1; img_convert_init(); }
--- a/mpc7.c Wed Feb 13 08:05:51 2008 +0000 +++ b/mpc7.c Wed Feb 13 09:26:10 2008 +0000 @@ -50,7 +50,7 @@ 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 @@ 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 @@ } } } - vlc_inited = 1; + vlc_initialized = 1; return 0; }
--- a/mpc8.c Wed Feb 13 08:05:51 2008 +0000 +++ b/mpc8.c Wed Feb 13 09:26:10 2008 +0000 @@ -97,7 +97,7 @@ 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 @@ 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 @@ &mpc8_q8_bits[i], 1, 1, &mpc8_q8_codes[i], 1, 1, INIT_VLC_USE_STATIC); } - vlc_inited = 1; + vlc_initialized = 1; return 0; }
--- a/mpegaudiodec.c Wed Feb 13 08:05:51 2008 +0000 +++ b/mpegaudiodec.c Wed Feb 13 09:26:10 2008 +0000 @@ -2524,7 +2524,7 @@ /* 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));
--- a/msmpeg4.c Wed Feb 13 08:05:51 2008 +0000 +++ b/msmpeg4.c Wed Feb 13 09:26:10 2008 +0000 @@ -87,7 +87,7 @@ static void common_init(MpegEncContext * s) { - static int inited=0; + static int initialized=0; switch(s->msmpeg4_version){ case 1: @@ -127,8 +127,8 @@ } //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(); }
--- a/qdm2.c Wed Feb 13 08:05:51 2008 +0000 +++ b/qdm2.c Wed Feb 13 09:26:10 2008 +0000 @@ -1692,11 +1692,11 @@ * @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);
--- a/utils.c Wed Feb 13 08:05:51 2008 +0000 +++ b/utils.c Wed Feb 13 09:26:10 2008 +0000 @@ -1254,11 +1254,11 @@ 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(); }
--- a/vc1.c Wed Feb 13 08:05:51 2008 +0000 +++ b/vc1.c Wed Feb 13 09:26:10 2008 +0000 @@ -3867,7 +3867,7 @@ 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 @@ 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; }
--- a/vp3.c Wed Feb 13 08:05:51 2008 +0000 +++ b/vp3.c Wed Feb 13 09:26:10 2008 +0000 @@ -273,7 +273,7 @@ * 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 @@ 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 @@ 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; }