diff options
44 files changed, 198 insertions, 198 deletions
@@ -843,7 +843,7 @@ static int mp_property_audio(m_option_t * prop, int action, void *arg, if (audio_id == -2 || (audio_id > -1 && mpctx->demuxer->audio->id != current_id && current_id != -2)) - uninit_player(INITED_AO | INITED_ACODEC); + uninit_player(INITIALIZED_AO | INITIALIZED_ACODEC); if (audio_id > -1 && mpctx->demuxer->audio->id != current_id) { sh_audio_t *sh2; sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id]; @@ -901,8 +901,8 @@ static int mp_property_video(m_option_t * prop, int action, void *arg, if (video_id == -2 || (video_id > -1 && mpctx->demuxer->video->id != current_id && current_id != -2)) - uninit_player(INITED_VCODEC | - (fixed_vo && video_id != -2 ? 0 : INITED_VO)); + uninit_player(INITIALIZED_VCODEC | + (fixed_vo && video_id != -2 ? 0 : INITIALIZED_VO)); if (video_id > -1 && mpctx->demuxer->video->id != current_id) { sh_video_t *sh2; sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id]; diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index 1d4ee6123c..891b44b32f 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -35,7 +35,7 @@ GtkWidget * ErrorPixmap; int gtkPopupMenu = 0; int gtkPopupMenuParam = 0; -int gtkInited = 0; +int gtkInitialized = 0; #include "gtk/sb.h" #include "gtk/pl.h" @@ -78,7 +78,7 @@ void gtkInit( void ) gtk_widget_destroy( win ); } - gtkInited=1; + gtkInitialized=1; } void gtkAddIcon( GtkWidget * window ) @@ -115,7 +115,7 @@ void gtkEventHandling( void ) void gtkMessageBox( int type,const gchar * str ) { - if ( !gtkInited ) return; + if ( !gtkInitialized ) return; ShowMessageBox( str ); gtk_label_set_text( GTK_LABEL( gtkMessageBoxText ),str ); /* enable linewrapping by alex */ diff --git a/help/help_mp-en.h b/help/help_mp-en.h index fe8b2557e9..af2aae9f63 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -163,7 +163,7 @@ static char help_text[]= #define MSGTR_LinuxRTCInitErrorPieOn "Linux RTC init error in ioctl (rtc_pie_on): %s\n" #define MSGTR_UsingTimingType "Using %s timing.\n" #define MSGTR_NoIdleAndGui "The -idle option cannot be used with GMPlayer.\n" -#define MSGTR_MenuInitialized "Menu inited: %s\n" +#define MSGTR_MenuInitialized "Menu initialized: %s\n" #define MSGTR_MenuInitFailed "Menu init failed.\n" #define MSGTR_Getch2InitializedTwice "WARNING: getch2_init called twice!\n" #define MSGTR_DumpstreamFdUnavailable "Cannot dump this stream - no file descriptor available.\n" diff --git a/input/ar.c b/input/ar.c index 5b5659157f..7347b4c326 100644 --- a/input/ar.c +++ b/input/ar.c @@ -106,7 +106,7 @@ static const cookie_keycode_map_t *ar_codes; static IOHIDQueueInterface **queue; static IOHIDDeviceInterface **hidDeviceInterface = NULL; -static int inited = 0; +static int initialized = 0; static int hidDeviceIsOpen; /* Maximum number of elements in queue before oldest elements @@ -221,7 +221,7 @@ int mp_input_ar_init(void) IOHIDElementCookie *cookies = NULL; int nr_cookies = 0; - if (inited) + if (initialized) mp_input_ar_close(-1); if (floor(NSAppKitVersionNumber) <= 824 /* NSAppKitVersionNumber10_4 */) { @@ -286,7 +286,7 @@ int mp_input_ar_init(void) // not useful anymore IOObjectRelease(hidObjectIterator); - inited = 1; + initialized = 1; return 0; mp_input_ar_init_error: @@ -335,7 +335,7 @@ int mp_input_ar_read(int fd) char cookie_queue[MAX_QUEUE_SIZE]; int value_queue[MAX_QUEUE_SIZE]; - if (inited == 0) + if (initialized == 0) return MP_INPUT_NOTHING; while ((result = (*queue)->getNextEvent(queue, &event, zeroTime, 0)) == kIOReturnSuccess) { @@ -415,7 +415,7 @@ int mp_input_ar_read(int fd) void mp_input_ar_close(int fd) { - if (inited == 0) + if (initialized == 0) return; // Close the device. @@ -431,7 +431,7 @@ void mp_input_ar_close(int fd) // Release the interface. (*hidDeviceInterface)->Release(hidDeviceInterface); - inited = 0; + initialized = 0; } #ifdef TEST diff --git a/input/joystick.c b/input/joystick.c index 312cd90f4d..0fb2c041ed 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -33,7 +33,7 @@ int btns = 0; int mp_input_joystick_init(char* dev) { int fd,l=0; - int inited = 0; + int initialized = 0; struct js_event ev; mp_msg(MSGT_INPUT,MSGL_V,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV); @@ -44,7 +44,7 @@ int mp_input_joystick_init(char* dev) { return -1; } - while(! inited) { + while(! initialized) { l = 0; while((unsigned int)l < sizeof(struct js_event)) { int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l); @@ -52,7 +52,7 @@ int mp_input_joystick_init(char* dev) { if(errno == EINTR) continue; else if(errno == EAGAIN) { - inited = 1; + initialized = 1; break; } mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,strerror(errno)); diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c index 8062c208c4..1208887ac1 100644 --- a/libaf/af_lavcac3enc.c +++ b/libaf/af_lavcac3enc.c @@ -45,7 +45,7 @@ typedef struct af_ac3enc_s { int min_channel_num; } af_ac3enc_t; -extern int avcodec_inited; +extern int avcodec_initialized; // Initialization and runtime control static int control(struct af_instance_s *af, int cmd, void *arg) @@ -287,10 +287,10 @@ static int af_open(af_instance_t* af){ af->data=calloc(1,sizeof(af_data_t)); af->setup=s; - if (!avcodec_inited){ + if (!avcodec_initialized){ avcodec_init(); avcodec_register_all(); - avcodec_inited=1; + avcodec_initialized=1; } s->lavc_acodec = avcodec_find_encoder_by_name("ac3"); diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index fe3924f4ca..3e9f51725a 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -127,7 +127,7 @@ static int init_device(int card) mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO SET AV SYNC: %s\n", strerror(errno)); return -1; } - //FIXME: in vo_mpegpes audio was inited as MUTEd + //FIXME: in vo_mpegpes audio was initialized as MUTEd if((ioctl(vo_mpegpes_fd2,AUDIO_SET_MUTE, false) < 0)) { mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO SET MUTE: %s\n", strerror(errno)); 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 */ |