[FFmpeg-cvslog] r11920 - in trunk: libavcodec/allcodecs.c libavcodec/dca.c libavcodec/error_resilience.c libavcodec/imgconvert.c libavcodec/mpc7.c libavcodec/mpc8.c libavcodec/mpegaudiodec.c libavcodec/msmpeg4.c libavcodec/qdm2.c libavcodec/utils.c libavcodec/vc1.c libavcodec/vp3.c libavdevice/alldevices.c libavformat/allformats.c libavformat/nutdec.c
diego
subversion
Wed Feb 13 10:26:10 CET 2008
Author: diego
Date: Wed Feb 13 10:26:10 2008
New Revision: 11920
Log:
typo fix: inited --> initialized
Modified:
trunk/libavcodec/allcodecs.c
trunk/libavcodec/dca.c
trunk/libavcodec/error_resilience.c
trunk/libavcodec/imgconvert.c
trunk/libavcodec/mpc7.c
trunk/libavcodec/mpc8.c
trunk/libavcodec/mpegaudiodec.c
trunk/libavcodec/msmpeg4.c
trunk/libavcodec/qdm2.c
trunk/libavcodec/utils.c
trunk/libavcodec/vc1.c
trunk/libavcodec/vp3.c
trunk/libavdevice/alldevices.c
trunk/libavformat/allformats.c
trunk/libavformat/nutdec.c
Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c (original)
+++ trunk/libavcodec/allcodecs.c Wed Feb 13 10:26:10 2008
@@ -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);
Modified: trunk/libavcodec/dca.c
==============================================================================
--- trunk/libavcodec/dca.c (original)
+++ trunk/libavcodec/dca.c Wed Feb 13 10:26:10 2008
@@ -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(AVCodecConte
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 *
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;
}
Modified: trunk/libavcodec/error_resilience.c
==============================================================================
--- trunk/libavcodec/error_resilience.c (original)
+++ trunk/libavcodec/error_resilience.c Wed Feb 13 10:26:10 2008
@@ -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;
}
Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c (original)
+++ trunk/libavcodec/imgconvert.c Wed Feb 13 10:26:10 2008
@@ -2350,7 +2350,7 @@ int img_convert(AVPicture *dst, int dst_
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_
if (src_width <= 0 || src_height <= 0)
return 0;
- if (!inited) {
- inited = 1;
+ if (!initialized) {
+ initialized = 1;
img_convert_init();
}
Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c (original)
+++ trunk/libavcodec/mpc7.c Wed Feb 13 10:26:10 2008
@@ -50,7 +50,7 @@ static int mpc7_decode_init(AVCodecConte
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(AVCodecConte
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(AVCodecConte
}
}
}
- vlc_inited = 1;
+ vlc_initialized = 1;
return 0;
}
Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c (original)
+++ trunk/libavcodec/mpc8.c Wed Feb 13 10:26:10 2008
@@ -97,7 +97,7 @@ static int mpc8_decode_init(AVCodecConte
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(AVCodecConte
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(AVCodecConte
&mpc8_q8_bits[i], 1, 1,
&mpc8_q8_codes[i], 1, 1, INIT_VLC_USE_STATIC);
}
- vlc_inited = 1;
+ vlc_initialized = 1;
return 0;
}
Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c (original)
+++ trunk/libavcodec/mpegaudiodec.c Wed Feb 13 10:26:10 2008
@@ -2524,7 +2524,7 @@ static int decode_init_mp3on4(AVCodecCon
/* 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));
Modified: trunk/libavcodec/msmpeg4.c
==============================================================================
--- trunk/libavcodec/msmpeg4.c (original)
+++ trunk/libavcodec/msmpeg4.c Wed Feb 13 10:26:10 2008
@@ -87,7 +87,7 @@ static uint8_t static_rl_table_store[NB_
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 *
}
//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();
}
Modified: trunk/libavcodec/qdm2.c
==============================================================================
--- trunk/libavcodec/qdm2.c (original)
+++ trunk/libavcodec/qdm2.c Wed Feb 13 10:26:10 2008
@@ -1692,11 +1692,11 @@ static void qdm2_synthesis_filter (QDM2C
* @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);
Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c (original)
+++ trunk/libavcodec/utils.c Wed Feb 13 10:26:10 2008
@@ -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();
}
Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c (original)
+++ trunk/libavcodec/vc1.c Wed Feb 13 10:26:10 2008
@@ -3867,7 +3867,7 @@ static int vc1_decode_init(AVCodecContex
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(AVCodecContex
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;
}
Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c (original)
+++ trunk/libavcodec/vp3.c Wed Feb 13 10:26:10 2008
@@ -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(AVCodecContex
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(AVCodecConte
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;
}
Modified: trunk/libavdevice/alldevices.c
==============================================================================
--- trunk/libavdevice/alldevices.c (original)
+++ trunk/libavdevice/alldevices.c Wed Feb 13 10:26:10 2008
@@ -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);
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c (original)
+++ trunk/libavformat/allformats.c Wed Feb 13 10:26:10 2008
@@ -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();
Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c (original)
+++ trunk/libavformat/nutdec.c Wed Feb 13 10:26:10 2008
@@ -531,7 +531,7 @@ static int nut_read_header(AVFormatConte
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(AVFormatConte
/* 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 */
More information about the ffmpeg-cvslog
mailing list