typo fix: inited --> initialized

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2

16 files changed, 69 insertions, 69 deletions

diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 472323a5de..937f7a44a8 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -30,7 +30,7 @@ LIBAD_EXTERN(ffmpeg)
 #include "avcodec.h"
 #endif
 
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 static int preinit(sh_audio_t *sh)
 {
@@ -45,10 +45,10 @@ static int init(sh_audio_t *sh_audio)
     AVCodec *lavc_codec;
 
     mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n");
-    if(!avcodec_inited){
+    if(!avcodec_initialized){
       avcodec_init();
       avcodec_register_all();
-      avcodec_inited=1;
+      avcodec_initialized=1;
     }
     
     lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll);
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index f8ba92ac56..a13fb7ec52 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -27,7 +27,7 @@ extern char *lavc_param_acodec;
 extern int  lavc_param_abitrate;
 extern int  lavc_param_atag;
 extern int  lavc_param_audio_global_header;
-extern int  avcodec_inited;
+extern int  avcodec_initialized;
 static int compressed_frame_size = 0;
 #ifdef USE_LIBAVFORMAT
 #ifdef USE_LIBAVFORMAT_SO
@@ -178,10 +178,10 @@ int mpae_init_lavc(audio_encoder_t *encoder)
 		return 0;
 	}
 
-	if(!avcodec_inited){
+	if(!avcodec_initialized){
 		avcodec_init();
 		avcodec_register_all();
-		avcodec_inited=1;
+		avcodec_initialized=1;
 	}
 
 	lavc_acodec = avcodec_find_encoder_by_name(lavc_param_acodec);
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index b7ce68f0b1..d20071b36f 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -98,7 +98,7 @@ static int init_audio_codec(sh_audio_t *sh_audio)
 	return 0;
     }
 
-    sh_audio->inited = 1;
+    sh_audio->initialized = 1;
 
     if (!sh_audio->channels || !sh_audio->samplerate) {
 	mp_msg(MSGT_DECAUDIO, MSGL_WARN, MSGTR_UnknownAudio);
@@ -233,9 +233,9 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
     if (!audio_codec_list)
 	audio_codec_list = ac_l_default;
     // Go through the codec.conf and find the best codec...
-    sh_audio->inited = 0;
+    sh_audio->initialized = 0;
     stringset_init(&selected);
-    while (!sh_audio->inited && *audio_codec_list) {
+    while (!sh_audio->initialized && *audio_codec_list) {
 	char *audio_codec = *(audio_codec_list++);
 	if (audio_codec[0]) {
 	    if (audio_codec[0] == '-') {
@@ -254,7 +254,7 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
 	    if (audio_fm_list) {
 		char **fmlist = audio_fm_list;
 		// try first the preferred codec families:
-		while (!sh_audio->inited && *fmlist) {
+		while (!sh_audio->initialized && *fmlist) {
 		    char *audio_fm = *(fmlist++);
 		    mp_msg(MSGT_DECAUDIO, MSGL_INFO, MSGTR_TryForceAudioFmtStr,
 			   audio_fm);
@@ -264,7 +264,7 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
 			    break;
 		}
 	    }
-	    if (!sh_audio->inited)
+	    if (!sh_audio->initialized)
 		for (status = CODECS_STATUS__MAX; status >= CODECS_STATUS__MIN;
 		     --status)
 		    if (init_audio(sh_audio, NULL, NULL, status, &selected))
@@ -273,7 +273,7 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
     }
     stringset_free(&selected);
 
-    if (!sh_audio->inited) {
+    if (!sh_audio->initialized) {
 	mp_msg(MSGT_DECAUDIO, MSGL_ERR, MSGTR_CantFindAudioCodec,
 	       sh_audio->format);
 	mp_msg(MSGT_DECAUDIO, MSGL_HINT, MSGTR_RTFMCodecs);
@@ -293,7 +293,7 @@ void uninit_audio(sh_audio_t *sh_audio)
 	free(sh_audio->afilter);
 	sh_audio->afilter = NULL;
     }
-    if (sh_audio->inited) {
+    if (sh_audio->initialized) {
 	mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr,
 	       sh_audio->codec->drv);
 	sh_audio->ad_driver->uninit(sh_audio);
@@ -301,7 +301,7 @@ void uninit_audio(sh_audio_t *sh_audio)
 	if (sh_audio->dec_handle)
 	    dlclose(sh_audio->dec_handle);
 #endif
-	sh_audio->inited = 0;
+	sh_audio->initialized = 0;
     }
     free(sh_audio->a_out_buffer);
     sh_audio->a_out_buffer = NULL;
@@ -467,14 +467,14 @@ int decode_audio(sh_audio_t *sh_audio, int minlen)
 void resync_audio_stream(sh_audio_t *sh_audio)
 {
     sh_audio->a_in_buffer_len = 0;	// clear audio input buffer
-    if (!sh_audio->inited)
+    if (!sh_audio->initialized)
 	return;
     sh_audio->ad_driver->control(sh_audio, ADCTRL_RESYNC_STREAM, NULL);
 }
 
 void skip_audio_frame(sh_audio_t *sh_audio)
 {
-    if (!sh_audio->inited)
+    if (!sh_audio->initialized)
 	return;
     if (sh_audio->ad_driver->control(sh_audio, ADCTRL_SKIP_FRAME, NULL) ==
 	CONTROL_TRUE)
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 403f29d4cd..ab63ec4006 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -152,7 +152,7 @@ int get_current_video_decoder_lag(sh_video_t *sh_video)
 }
 
 void uninit_video(sh_video_t *sh_video){
-    if(!sh_video->inited) return;
+    if(!sh_video->initialized) return;
     mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv);
     mpvdec->uninit(sh_video);
 #ifdef DYNAMIC_PLUGINS
@@ -160,7 +160,7 @@ void uninit_video(sh_video_t *sh_video){
 	dlclose(sh_video->dec_handle);
 #endif
     vf_uninit_filter_chain(sh_video->vfilter);
-    sh_video->inited=0;
+    sh_video->initialized=0;
 }
 
 void vfm_help(void){
@@ -180,7 +180,7 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status,
     int force = 0;
     unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0;
     sh_video->codec=NULL;
-    sh_video->vf_inited=0;
+    sh_video->vf_initialized=0;
     if (codecname && codecname[0] == '+') {
       codecname = &codecname[1];
       force = 1;
@@ -259,8 +259,8 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status,
 	// init()
 	mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name);
 	// clear vf init error, it is no longer relevant
-	if (sh_video->vf_inited < 0)
-		sh_video->vf_inited = 0;
+	if (sh_video->vf_initialized < 0)
+		sh_video->vf_initialized = 0;
 	if(!mpvdec->init(sh_video)){
 	    mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed);
 	    sh_video->disp_w=orig_w;
@@ -272,7 +272,7 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status,
 	    continue; // try next...
 	}
 	// Yeah! We got it!
-	sh_video->inited=1;
+	sh_video->initialized=1;
 	return 1;
     }
     return 0;
@@ -284,9 +284,9 @@ stringset_t selected;
 // hack:
 if(!video_codec_list) video_codec_list=vc_l_default;
 // Go through the codec.conf and find the best codec...
-sh_video->inited=0;
+sh_video->initialized=0;
 stringset_init(&selected);
-while(!sh_video->inited && *video_codec_list){
+while(!sh_video->initialized && *video_codec_list){
   char* video_codec=*(video_codec_list++);
   if(video_codec[0]){
     if(video_codec[0]=='-'){
@@ -303,21 +303,21 @@ while(!sh_video->inited && *video_codec_list){
     if(video_fm_list){
       char** fmlist=video_fm_list;
       // try first the preferred codec families:
-      while(!sh_video->inited && *fmlist){
+      while(!sh_video->initialized && *fmlist){
         char* video_fm=*(fmlist++);
 	mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_TryForceVideoFmtStr,video_fm);
 	for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
 	    if(init_video(sh_video,NULL,video_fm,status, &selected)) break;
       }
     }
-    if(!sh_video->inited)
+    if(!sh_video->initialized)
 	for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status)
 	    if(init_video(sh_video,NULL,NULL,status, &selected)) break;
   }
 }
 stringset_free(&selected);
 
-if(!sh_video->inited){
+if(!sh_video->initialized){
     mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
     mp_msg(MSGT_DECAUDIO,MSGL_HINT, MSGTR_RTFMCodecs);
     return 0; // failed
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 6bc8ba38ad..d287241890 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -225,7 +225,7 @@ csp_again:
 	     }
 	}
 	mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_VOincompCodec);
-	sh->vf_inited=-1;
+	sh->vf_initialized=-1;
 	return 0;	// failed
     }
     out_fmt=sh->codec->outfmt[j];
@@ -312,11 +312,11 @@ csp_again:
 			 out_fmt)==0){
 //                      "MPlayer",out_fmt)){
 	mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
-	sh->vf_inited=-1;
+	sh->vf_initialized=-1;
 	return 0;
     }
 
-    sh->vf_inited=1;
+    sh->vf_initialized=1;
 
     if (vo_gamma_gamma != 1000)
         set_video_colors(sh, "gamma", vo_gamma_gamma);
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index bdbb322694..60db717f58 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -33,7 +33,7 @@ LIBVD_EXTERN(ffmpeg)
 #include "xvmc_render.h"
 #endif
 
-int avcodec_inited=0;
+int avcodec_initialized=0;
 
 typedef struct {
     AVCodecContext *avctx;
@@ -41,7 +41,7 @@ typedef struct {
     enum PixelFormat pix_fmt;
     int do_slices;
     int do_dr1;
-    int vo_inited;
+    int vo_initialized;
     int best_csp;
     int b_age;
     int ip_age[2];
@@ -227,10 +227,10 @@ static int init(sh_video_t *sh){
     int lowres_w=0;
     int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP));
 
-    if(!avcodec_inited){
+    if(!avcodec_initialized){
       avcodec_init();
       avcodec_register_all();
-      avcodec_inited=1;
+      avcodec_initialized=1;
       av_log_set_callback(mp_msp_av_log_callback);
     }
 
@@ -501,7 +501,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
 	width != sh->disp_w  ||
 	height != sh->disp_h ||
 	pix_fmt != ctx->pix_fmt ||
-	!ctx->vo_inited)
+	!ctx->vo_initialized)
     {
 	mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
 	if (sh->aspect == 0 ||
@@ -541,7 +541,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
 	}
     	if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp))
     		return -1;
-	ctx->vo_inited = 1;
+	ctx->vo_initialized = 1;
     }
     return 0;
 }
@@ -742,7 +742,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
     if (!dr1)
     avctx->draw_horiz_band=NULL;
     avctx->opaque=sh;
-    if(ctx->vo_inited && !(flags&3) && !dr1){
+    if(ctx->vo_initialized && !(flags&3) && !dr1){
 	mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE |
 	    (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0),
 	    sh->disp_w, sh->disp_h);
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c
index d28574fb18..81c1a1d8a3 100644
--- a/libmpcodecs/vd_libmpeg2.c
+++ b/libmpcodecs/vd_libmpeg2.c
@@ -173,7 +173,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 	    pw = info->sequence->display_width * info->sequence->pixel_width;
 	    ph = info->sequence->display_height * info->sequence->pixel_height;
 	    if(ph) sh->aspect = (float) pw / (float) ph;
-	    // video parameters inited/changed, (re)init libvo:
+	    // video parameters initialized/changed, (re)init libvo:
 	    if (info->sequence->width >> 1 == info->sequence->chroma_width &&
 		info->sequence->height >> 1 == info->sequence->chroma_height) {
 		if(!mpcodecs_config_vo(sh,
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index 1d8f405b12..b23a8f2ee1 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -95,7 +95,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
     return CONTROL_UNKNOWN;
 }
 
-static int codec_inited=0;
+static int codec_initialized=0;
 
 // init driver
 static int init(sh_video_t *sh){
@@ -106,7 +106,7 @@ static int init(sh_video_t *sh){
     CodecInfo cinfo;	// for ImageCodecGetCodecInfo()
     ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
 
-    codec_inited = 0;
+    codec_initialized = 0;
 #ifdef MACOSX
     EnterMovies();
 #else
@@ -315,7 +315,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
     decpar.bufferSize = len;
     (**framedescHandle).dataSize=len;
 
-if(!codec_inited){
+if(!codec_initialized){
     result = QTNewGWorldFromPtr(
         &OutBufferGWorld,  
 //        kYUVSPixelFormat, //pixel format of new GWorld == YUY2
@@ -382,7 +382,7 @@ if(!codec_inited){
 //    printf("ImageCodecPreDecompress cres=0x%X\n",cres);
 
 
-    codec_inited=1;
+    codec_initialized=1;
 }
 
 #if 0
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index bb28e15b06..dee690a895 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -58,7 +58,7 @@ static unsigned long WINAPI (*wrvyuv_transform)(char*, char*,transform_in_t*,uns
 #endif
 
 static void *rv_handle=NULL;
-static int inited=0;
+static int initialized=0;
 static uint8_t *buffer = NULL;
 static int bufsz = 0;
 #ifdef USE_WIN32DLL
@@ -341,7 +341,7 @@ static void uninit(sh_video_t *sh){
 	if(rv_handle) dlclose(rv_handle);
 #endif
 	rv_handle=NULL;
-	inited = 0;
+	initialized = 0;
 	if (buffer)
 	    free(buffer);
 	buffer = NULL;
@@ -392,12 +392,12 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 	result=(*rvyuv_transform)(dp_data, buffer, &transform_in,
 		transform_out, sh->context);
 
-	if(!inited){  // rv30 width/height now known
+	if(!initialized){  // rv30 width/height now known
 	    sh->aspect=(float)sh->disp_w/(float)sh->disp_h;
 	    sh->disp_w=transform_out[3];
 	    sh->disp_h=transform_out[4];
 	    if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0;
-	    inited=1;
+	    initialized=1;
 	} 
 	    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 		    sh->disp_w, sh->disp_h);
@@ -411,7 +411,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 
 	if(transform_out[0] &&
 	   (sh->disp_w != transform_out[3] || sh->disp_h != transform_out[4]))
-	    inited = 0;
+	    initialized = 0;
 	
 	return (result?NULL:mpi);
 }
diff --git a/libmpcodecs/vd_zrmjpeg.c b/libmpcodecs/vd_zrmjpeg.c
index e4f51d9096..c33c71778a 100644
--- a/libmpcodecs/vd_zrmjpeg.c
+++ b/libmpcodecs/vd_zrmjpeg.c
@@ -33,7 +33,7 @@ LIBVD_EXTERN(zrmjpeg)
 #include "libvo/video_out.h"
 
 typedef struct {
-	int vo_inited;
+	int vo_initialized;
 	unsigned int preferred_csp;
 } vd_zrmjpeg_ctx_t;
 
@@ -215,12 +215,12 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) {
 	mp_image_t* mpi;
 	vd_zrmjpeg_ctx_t *ctx = sh->context;
 
-	if (!ctx->vo_inited) {
+	if (!ctx->vo_initialized) {
 		ctx->preferred_csp = guess_mjpeg_type(data, len, sh->disp_h);
 		if (ctx->preferred_csp == 0) return NULL;
 		mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, 
 				ctx->preferred_csp);
-		ctx->vo_inited = 1;
+		ctx->vo_initialized = 1;
 	}
 
 	mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 07541c3c99..552779d7e9 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -36,7 +36,7 @@ extern char* passtmpfile;
 #include "libavcodec/avcodec.h"
 #endif
 
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 /* video options */
 static char *lavc_param_vcodec = "mpeg4";
@@ -1019,10 +1019,10 @@ static int vf_open(vf_instance_t *vf, char* args){
 	mux_v->bih->biCompression = mmioFOURCC(lavc_param_vcodec[0],
 		lavc_param_vcodec[1], lavc_param_vcodec[2], lavc_param_vcodec[3]); /* FIXME!!! */
 
-    if (!avcodec_inited){
+    if (!avcodec_initialized){
 	avcodec_init();
 	avcodec_register_all();
-	avcodec_inited=1;
+	avcodec_initialized=1;
     }
 
     vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name(lavc_param_vcodec);
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index fee22005dd..23c63bc655 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -170,7 +170,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     return 0;
 }
 
-static int codec_inited = 0;
+static int codec_initialized = 0;
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
@@ -182,7 +182,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     int width = mpi->width;
     int height = mpi->height;
     int stride = width*2;
-if(!codec_inited){
+if(!codec_initialized){
     FrameRect.top=0;
     FrameRect.left=0;
     FrameRect.right=width;
@@ -243,7 +243,7 @@ if(!codec_inited){
     mp_msg(MSGT_MENCODER,MSGL_DBG2,"Sequence ID:%i\n",seq);
 
     dump_ImageDescription(*desc);
-    codec_inited++;
+    codec_initialized++;
 }
     cres = CompressSequenceFrame (
     	seq,
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index 09958ad0e4..c1759061e6 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -1283,7 +1283,7 @@ flush_internal_buffers(xvid_mplayer_module_t *mod)
 	xvid_enc_frame_t *frame = &mod->frame;
 
 	if (mod->instance == NULL)
-	    return;/*encoder not inited*/
+	    return; /* encoder not initialized */
 
 	/* Init a fake frame to force flushing */
 	frame->version = XVID_VERSION;
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
index db4fbc727d..ca8656441c 100644
--- a/libmpcodecs/vf_lavc.c
+++ b/libmpcodecs/vf_lavc.c
@@ -17,7 +17,7 @@
 #include "libavcodec/avcodec.h"
 #endif
 
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 struct vf_priv_s {
     unsigned char* outbuf;
@@ -127,10 +127,10 @@ static int open(vf_instance_t *vf, char* args){
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
 
-    if (!avcodec_inited){
+    if (!avcodec_initialized){
 	avcodec_init();
 	avcodec_register_all();
-	avcodec_inited=1;
+	avcodec_initialized=1;
     }
 
     vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name("mpeg1video");
diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c
index 173c17612b..271855694b 100644
--- a/libmpcodecs/vf_lavcdeint.c
+++ b/libmpcodecs/vf_lavcdeint.c
@@ -17,7 +17,7 @@
 #include "libavcodec/avcodec.h"
 #endif
 
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 struct vf_priv_s 
 {
@@ -162,11 +162,11 @@ open (vf_instance_t *vf, char* args)
   /* This may not technically be necessary just for a deinterlace,
    * but it seems like a good idea.
    */
-  if(!avcodec_inited)
+  if(!avcodec_initialized)
     {
       avcodec_init();
       avcodec_register_all();
-      avcodec_inited=1;
+      avcodec_initialized=1;
     }
 
   return 1;
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index 91a88eb9b1..d74a4db9f5 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/libmpcodecs/vf_zrmjpeg.c
@@ -39,7 +39,7 @@
 #undef free
 #undef realloc
 
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 /* some convenient #define's, is this portable enough? */
 /// Printout  with vf_zrmjpeg: prefix at VERBOSE level
@@ -52,7 +52,7 @@ extern int avcodec_inited;
 
 // "local" flag in vd_ffmpeg.c. If not set, avcodec_init() et. al. need to be called
 // set when init is done, so that initialization is not done twice.
-extern int avcodec_inited;
+extern int avcodec_initialized;
 
 /// structure copied from mjpeg.c
 /* zrmjpeg_encode_mb needs access to these tables for the black & white
@@ -479,10 +479,10 @@ static jpeg_enc_t *jpeg_enc_init(int w, int h, int y_rsize,
 	/* if libavcodec is used by the decoder then we must not
 	 * initialize again, but if it is not initialized then we must
 	 * initialize it here. */
-	if (!avcodec_inited) {
+	if (!avcodec_initialized) {
 		avcodec_init();
 		avcodec_register_all();
-		avcodec_inited=1;
+		avcodec_initialized=1;
 	}
 
 	// Build mjpeg huffman code tables, setting up j->s->mjpeg_ctx
@@ -921,11 +921,11 @@ static int open(vf_instance_t *vf, char* args){
 
 	/* if libavcodec is already initialized, we must not initialize it
 	 * again, but if it is not initialized then we mustinitialize it now. */
-	if (!avcodec_inited) {
+	if (!avcodec_initialized) {
 		/* we need to initialize libavcodec */
 		avcodec_init();
 		avcodec_register_all();
-		avcodec_inited=1;
+		avcodec_initialized=1;
 	}
 
 	if (args) {