[MPlayer-cvslog] r25994 - in trunk: command.c gui/mplayer/widgets.c help/help_mp-en.h input/ar.c input/joystick.c libaf/af_lavcac3enc.c libao2/ao_mpegpes.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ae_lavc.c libmpcodecs/dec_audio.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vd_ffmpeg.c libmpcodecs/vd_libmpeg2.c libmpcodecs/vd_qtvideo.c libmpcodecs/vd_realvid.c libmpcodecs/vd_zrmjpeg.c libmpcodecs/ve_lavc.c libmpcodecs/ve_qtvideo.c libmpcodecs/ve_xvid4.c libmpcodecs/vf_lavc.c libmpcodecs/vf_lavcdeint.c libmpcodecs/vf_zrmjpeg.c libmpdemux/demux_ogg.c libmpdemux/demux_ty_osd.c libmpdemux/muxer_mpeg.c libmpdemux/stheader.h libvo/jpeg_enc.c libvo/mga_common.c libvo/vo_directx.c libvo/vo_dxr2.c libvo/vo_vesa.c libvo/vo_x11.c libvo/vo_xmga.c libvo/vo_xv.c libvo/x11_common.c m_config.c mencoder.c mp_core.h mp_msg.c mplayer.c stream/stream_radio.c stream/tvi_v4l2.c sub_cc.c
diego
subversion at mplayerhq.hu
Thu Feb 14 15:23:55 CET 2008
Author: diego
Date: Thu Feb 14 15:23:55 2008
New Revision: 25994
Log:
typo fix: inited --> initialized
Modified:
trunk/command.c
trunk/gui/mplayer/widgets.c
trunk/input/ar.c
trunk/input/joystick.c
trunk/libaf/af_lavcac3enc.c
trunk/libao2/ao_mpegpes.c
trunk/libmpcodecs/ad_ffmpeg.c
trunk/libmpcodecs/ae_lavc.c
trunk/libmpcodecs/dec_audio.c
trunk/libmpcodecs/dec_video.c
trunk/libmpcodecs/vd.c
trunk/libmpcodecs/vd_ffmpeg.c
trunk/libmpcodecs/vd_libmpeg2.c
trunk/libmpcodecs/vd_qtvideo.c
trunk/libmpcodecs/vd_realvid.c
trunk/libmpcodecs/vd_zrmjpeg.c
trunk/libmpcodecs/ve_lavc.c
trunk/libmpcodecs/ve_qtvideo.c
trunk/libmpcodecs/ve_xvid4.c
trunk/libmpcodecs/vf_lavc.c
trunk/libmpcodecs/vf_lavcdeint.c
trunk/libmpcodecs/vf_zrmjpeg.c
trunk/libmpdemux/demux_ogg.c
trunk/libmpdemux/demux_ty_osd.c
trunk/libmpdemux/muxer_mpeg.c
trunk/libmpdemux/stheader.h
trunk/libvo/jpeg_enc.c
trunk/libvo/mga_common.c
trunk/libvo/vo_directx.c
trunk/libvo/vo_dxr2.c
trunk/libvo/vo_vesa.c
trunk/libvo/vo_x11.c
trunk/libvo/vo_xmga.c
trunk/libvo/vo_xv.c
trunk/libvo/x11_common.c
trunk/m_config.c
trunk/mencoder.c
trunk/mp_core.h
trunk/mp_msg.c
trunk/mplayer.c
trunk/stream/stream_radio.c
trunk/stream/tvi_v4l2.c
trunk/sub_cc.c
Changes in other areas also in this revision:
Modified:
trunk/help/help_mp-en.h
Modified: trunk/command.c
==============================================================================
--- trunk/command.c (original)
+++ trunk/command.c Thu Feb 14 15:23:55 2008
@@ -843,7 +843,7 @@ static int mp_property_audio(m_option_t
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
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];
Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c (original)
+++ trunk/gui/mplayer/widgets.c Thu Feb 14 15:23:55 2008
@@ -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 */
Modified: trunk/input/ar.c
==============================================================================
--- trunk/input/ar.c (original)
+++ trunk/input/ar.c Thu Feb 14 15:23:55 2008
@@ -106,7 +106,7 @@ static const cookie_keycode_map_t *ar_co
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
Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c (original)
+++ trunk/input/joystick.c Thu Feb 14 15:23:55 2008
@@ -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));
Modified: trunk/libaf/af_lavcac3enc.c
==============================================================================
--- trunk/libaf/af_lavcac3enc.c (original)
+++ trunk/libaf/af_lavcac3enc.c Thu Feb 14 15:23:55 2008
@@ -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");
Modified: trunk/libao2/ao_mpegpes.c
==============================================================================
--- trunk/libao2/ao_mpegpes.c (original)
+++ trunk/libao2/ao_mpegpes.c Thu Feb 14 15:23:55 2008
@@ -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));
Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c (original)
+++ trunk/libmpcodecs/ad_ffmpeg.c Thu Feb 14 15:23:55 2008
@@ -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);
Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c (original)
+++ trunk/libmpcodecs/ae_lavc.c Thu Feb 14 15:23:55 2008
@@ -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 *enco
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);
Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c (original)
+++ trunk/libmpcodecs/dec_audio.c Thu Feb 14 15:23:55 2008
@@ -98,7 +98,7 @@ static int init_audio_codec(sh_audio_t *
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
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
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
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
}
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, i
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)
Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c (original)
+++ trunk/libmpcodecs/dec_video.c Thu Feb 14 15:23:55 2008
@@ -152,7 +152,7 @@ int get_current_video_decoder_lag(sh_vid
}
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_vid
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_vid
// 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_vid
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_
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
Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c (original)
+++ trunk/libmpcodecs/vd.c Thu Feb 14 15:23:55 2008
@@ -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);
Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c (original)
+++ trunk/libmpcodecs/vd_ffmpeg.c Thu Feb 14 15:23:55 2008
@@ -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
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
}
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
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);
Modified: trunk/libmpcodecs/vd_libmpeg2.c
==============================================================================
--- trunk/libmpcodecs/vd_libmpeg2.c (original)
+++ trunk/libmpcodecs/vd_libmpeg2.c Thu Feb 14 15:23:55 2008
@@ -173,7 +173,7 @@ static mp_image_t* decode(sh_video_t *sh
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,
Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c (original)
+++ trunk/libmpcodecs/vd_qtvideo.c Thu Feb 14 15:23:55 2008
@@ -95,7 +95,7 @@ static int control(sh_video_t *sh,int cm
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
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
Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c (original)
+++ trunk/libmpcodecs/vd_realvid.c Thu Feb 14 15:23:55 2008
@@ -58,7 +58,7 @@ static unsigned long WINAPI (*wrvyuv_tra
#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
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
if(transform_out[0] &&
(sh->disp_w != transform_out[3] || sh->disp_h != transform_out[4]))
- inited = 0;
+ initialized = 0;
return (result?NULL:mpi);
}
Modified: trunk/libmpcodecs/vd_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_zrmjpeg.c (original)
+++ trunk/libmpcodecs/vd_zrmjpeg.c Thu Feb 14 15:23:55 2008
@@ -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
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,
Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c (original)
+++ trunk/libmpcodecs/ve_lavc.c Thu Feb 14 15:23:55 2008
@@ -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, ch
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);
Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c (original)
+++ trunk/libmpcodecs/ve_qtvideo.c Thu Feb 14 15:23:55 2008
@@ -170,7 +170,7 @@ static int query_format(struct vf_instan
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_
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,
Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c (original)
+++ trunk/libmpcodecs/ve_xvid4.c Thu Feb 14 15:23:55 2008
@@ -1283,7 +1283,7 @@ flush_internal_buffers(xvid_mplayer_modu
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;
Modified: trunk/libmpcodecs/vf_lavc.c
==============================================================================
--- trunk/libmpcodecs/vf_lavc.c (original)
+++ trunk/libmpcodecs/vf_lavc.c Thu Feb 14 15:23:55 2008
@@ -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*
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");
Modified: trunk/libmpcodecs/vf_lavcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_lavcdeint.c (original)
+++ trunk/libmpcodecs/vf_lavcdeint.c Thu Feb 14 15:23:55 2008
@@ -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;
Modified: trunk/libmpcodecs/vf_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vf_zrmjpeg.c (original)
+++ trunk/libmpcodecs/vf_zrmjpeg.c Thu Feb 14 15:23:55 2008
@@ -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,
/* 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*
/* 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) {
Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c (original)
+++ trunk/libmpdemux/demux_ogg.c Thu Feb 14 15:23:55 2008
@@ -111,7 +111,7 @@ typedef struct ogg_stream {
int id;
vorbis_info vi;
- int vi_inited;
+ int vi_initialized;
void *ogg_d;
} ogg_stream_t;
@@ -245,7 +245,7 @@ static unsigned char* demux_ogg_read_pac
if(os->vorbis) {
if(*pack->packet & PACKET_TYPE_HEADER)
os->hdr_packets++;
- else if (os->vi_inited)
+ else if (os->vi_initialized)
{
vorbis_info *vi;
int32_t blocksize;
@@ -690,7 +690,7 @@ static void fixup_vorbis_wf(sh_audio_t *
}
vorbis_comment_clear(&vc);
if(!init_error)
- os->vi_inited = 1;
+ os->vi_initialized = 1;
len = op[0].bytes + op[1].bytes + op[2].bytes;
sh->wf = calloc(1, sizeof(WAVEFORMATEX) + len + len/255 + 64);
@@ -1519,7 +1519,7 @@ static void demux_close_ogg(demuxer_t* d
{
os = &ogg_d->subs[i];
ogg_stream_clear(&os->stream);
- if(os->vi_inited)
+ if(os->vi_initialized)
vorbis_info_clear(&os->vi);
}
free(ogg_d->subs);
Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c (original)
+++ trunk/libmpdemux/demux_ty_osd.c Thu Feb 14 15:23:55 2008
@@ -61,7 +61,7 @@ static subtitle ty_OSD1;
static subtitle ty_OSD2;
static subtitle *ty_pOSD1;
static subtitle *ty_pOSD2;
-static int tyOSDInited = 0;
+static int tyOSDInitialized = 0;
static int tyOSDUpdate = 0;
static void ty_DrawOSD(void)
@@ -870,7 +870,7 @@ void ty_processuserdata( unsigned char*
if ( subcc_enabled )
{
- if ( tyOSDInited == 0 )
+ if ( tyOSDInitialized == 0 )
{
for ( index = 0; index < SUB_MAX_TEXT ; index++ )
{
@@ -883,7 +883,7 @@ void ty_processuserdata( unsigned char*
ty_pOSD1 = &ty_OSD1;
ty_pOSD2 = &ty_OSD2;
tyOSDUpdate = 0;
- tyOSDInited = 1;
+ tyOSDInitialized = 1;
}
if ( buf[ 0 ] == 0x01 )
Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c (original)
+++ trunk/libmpdemux/muxer_mpeg.c Thu Feb 14 15:23:55 2008
@@ -1111,7 +1111,7 @@ static int get_packet_stats(muxer_priv_t
static int fill_packet(muxer_t *muxer, muxer_stream_t *s, int finalize)
{
//try to fill a packet as much as possible
- //spriv->pack_offset is the start position inited to 0
+ //spriv->pack_offset is the start position initialized to 0
//data is taken from spriv->framebuf
//if audio and a52 insert the headers
muxer_priv_t *priv = (muxer_priv_t *) muxer->priv;
Modified: trunk/libmpdemux/stheader.h
==============================================================================
--- trunk/libmpdemux/stheader.h (original)
+++ trunk/libmpdemux/stheader.h Thu Feb 14 15:23:55 2008
@@ -11,7 +11,7 @@ typedef struct {
demux_stream_t *ds;
struct codecs_st *codec;
unsigned int format;
- int inited;
+ int initialized;
float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar)
// output format:
int sample_format;
@@ -56,7 +56,7 @@ typedef struct {
demux_stream_t *ds;
struct codecs_st *codec;
unsigned int format;
- int inited;
+ int initialized;
float timer; // absolute time in video stream, since last start/seek
float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar)
// frame counters:
@@ -79,7 +79,7 @@ typedef struct {
// output driver/filters: (set by libmpcodecs core)
unsigned int outfmtidx;
struct vf_instance_s *vfilter; // the video filter chain, used for this video stream
- int vf_inited;
+ int vf_initialized;
#ifdef DYNAMIC_PLUGINS
void *dec_handle;
#endif
Modified: trunk/libvo/jpeg_enc.c
==============================================================================
--- trunk/libvo/jpeg_enc.c (original)
+++ trunk/libvo/jpeg_enc.c Thu Feb 14 15:23:55 2008
@@ -39,7 +39,7 @@
#include "jpeg_enc.h"
-extern int avcodec_inited;
+extern int avcodec_initialized;
/* Begin excessive code duplication ************************************/
@@ -319,11 +319,11 @@ jpeg_enc_t *jpeg_enc_init(int w, int h,
/* 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) {
/* we need to initialize libavcodec */
avcodec_init();
avcodec_register_all();
- avcodec_inited=1;
+ avcodec_initialized=1;
}
if (ff_mjpeg_encode_init(j->s) < 0) {
Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c (original)
+++ trunk/libvo/mga_common.c Thu Feb 14 15:23:55 2008
@@ -327,7 +327,7 @@ static int control(uint32_t request, voi
vo_x11_ontop();
return VO_TRUE;
case VOCTRL_GET_PANSCAN:
- if ( !inited || !vo_fs ) return VO_FALSE;
+ if ( !initialized || !vo_fs ) return VO_FALSE;
return VO_TRUE;
case VOCTRL_FULLSCREEN:
vo_x11_fullscreen();
Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c (original)
+++ trunk/libvo/vo_directx.c Thu Feb 14 15:23:55 2008
@@ -375,7 +375,7 @@ static void uninit(void)
FreeLibrary( hddraw_dll);
hddraw_dll= NULL;
mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>ddraw.dll freed\n");
- mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninited\n");
+ mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninitialized\n");
}
static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm)
@@ -509,7 +509,7 @@ static uint32_t Directx_InitDirectDraw()
mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't set displaymode\n");
return 1;
}
- mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>Inited adapter %i for %i x %i @ %i \n",vo_adapter_num,vm_width,vm_height,vm_bpp);
+ mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>Initialized adapter %i for %i x %i @ %i \n",vo_adapter_num,vm_width,vm_height,vm_bpp);
return 0;
}
if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, hWnd, DDSCL_NORMAL) != DD_OK) // or DDSCL_SETFOCUSWINDOW
@@ -517,7 +517,7 @@ static uint32_t Directx_InitDirectDraw()
mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>could not set cooperativelevel for hardwarecheck\n");
return 1;
}
- mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>DirectDraw Inited\n");
+ mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>DirectDraw Initialized\n");
return 0;
}
Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c (original)
+++ trunk/libvo/vo_dxr2.c Thu Feb 14 15:23:55 2008
@@ -841,7 +841,7 @@ static int preinit(const char *arg) {
use_ol = 0;
} else {
uint32_t fmt = IMGFMT_BGR24;
- mp_msg(MSGT_VO,MSGL_V,"VO: [dxr2] Sub vo %s inited\n",arg);
+ mp_msg(MSGT_VO,MSGL_V,"VO: [dxr2] Sub vo %s initialized\n",arg);
if(sub_vo->control(VOCTRL_QUERY_FORMAT,&fmt) <= 0) {
mp_msg(MSGT_VO,MSGL_WARN,"VO: [dxr2] Sub vo %s doesn't support BGR24 => no overlay\n",arg);
sub_vo->uninit();
Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c (original)
+++ trunk/libvo/vo_vesa.c Thu Feb 14 15:23:55 2008
@@ -1046,7 +1046,7 @@ config(uint32_t width, uint32_t height,
static void
uninit(void)
{
- // not inited
+ // not initialized
vesa_term();
if( mp_msg_test(MSGT_VO,MSGL_DBG3) )
mp_msg(MSGT_VO,MSGL_DBG3, "vo_vesa: uninit was called\n");
Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c (original)
+++ trunk/libvo/vo_x11.c Thu Feb 14 15:23:55 2008
@@ -25,7 +25,7 @@
static int Shmem_Flag;
-//static int Quiet_Flag; Here also what is this for. It's used but isn't inited ?
+//static int Quiet_Flag; Here also what is this for. It's used but isn't initialized?
static XShmSegmentInfo Shminfo[1];
static int gXErrorFlag;
static int CompletionType = -1;
Modified: trunk/libvo/vo_xmga.c
==============================================================================
--- trunk/libvo/vo_xmga.c (original)
+++ trunk/libvo/vo_xmga.c Thu Feb 14 15:23:55 2008
@@ -68,7 +68,7 @@ static Window mRoot;
static XSetWindowAttributes xWAttribs;
-static int inited = 0;
+static int initialized = 0;
#define VO_XMGA
#include "mga_common.c"
@@ -169,7 +169,7 @@ static int config(uint32_t width, uint32
}
mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
- inited = 1;
+ initialized = 1;
#ifdef HAVE_NEW_GUI
if (use_gui)
@@ -262,8 +262,8 @@ static void uninit(void)
{
mp_msg(MSGT_VO, MSGL_V, "vo: uninit!\n");
mga_uninit();
- if (!inited)
+ if (!initialized)
return; // no window?
- inited = 0;
+ initialized = 0;
vo_x11_uninit(); // destroy the window
}
Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c (original)
+++ trunk/libvo/vo_xv.c Thu Feb 14 15:23:55 2008
@@ -45,7 +45,7 @@ Buffer allocation:
#include "gui/interface.h"
#endif
-#include "libavutil/common.h"
+#include "ffmpeg/libavutil/common.h"
static const vo_info_t info = {
"X11/Xv",
Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c (original)
+++ trunk/libvo/x11_common.c Thu Feb 14 15:23:55 2008
@@ -546,7 +546,7 @@ void vo_uninit(void)
if (!mDisplay)
{
mp_msg(MSGT_VO, MSGL_V,
- "vo: x11 uninit called but X11 not inited..\n");
+ "vo: x11 uninit called but X11 not initialized..\n");
return;
}
// if( !vo_depthonscreen ) return;
Modified: trunk/m_config.c
==============================================================================
--- trunk/m_config.c (original)
+++ trunk/m_config.c Thu Feb 14 15:23:55 2008
@@ -37,7 +37,7 @@ list_options(m_option_t *opt, char* name
m_config_t*
m_config_new(void) {
m_config_t* config;
- static int inited = 0;
+ static int initialized = 0;
static m_option_type_t profile_opt_type;
static m_option_t ref_opts[] = {
{ "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL },
@@ -49,8 +49,8 @@ m_config_new(void) {
config = calloc(1,sizeof(m_config_t));
config->lvl = 1; // 0 Is the defaults
- if(!inited) {
- inited = 1;
+ if(!initialized) {
+ initialized = 1;
profile_opt_type = m_option_type_string_list;
profile_opt_type.parse = parse_profile;
profile_opt_type.set = set_profile;
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c (original)
+++ trunk/mencoder.c Thu Feb 14 15:23:55 2008
@@ -876,7 +876,7 @@ default: {
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
init_best_video_codec(sh_video,video_codec_list,video_fm_list);
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
- if(!sh_video->inited) mencoder_exit(1,NULL);
+ if(!sh_video->initialized) mencoder_exit(1,NULL);
}
}
@@ -1330,7 +1330,7 @@ default:
skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE);
blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);}
- if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
+ if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);
if(!blit_frame){
if (play_n_frames >= 0)
Modified: trunk/mp_core.h
==============================================================================
--- trunk/mp_core.h (original)
+++ trunk/mp_core.h Thu Feb 14 15:23:55 2008
@@ -5,18 +5,18 @@
// definitions used internally by the core player code
-#define INITED_VO 1
-#define INITED_AO 2
-#define INITED_GUI 4
-#define INITED_GETCH2 8
-#define INITED_SPUDEC 32
-#define INITED_STREAM 64
-#define INITED_INPUT 128
-#define INITED_VOBSUB 256
-#define INITED_DEMUXER 512
-#define INITED_ACODEC 1024
-#define INITED_VCODEC 2048
-#define INITED_ALL 0xFFFF
+#define INITIALIZED_VO 1
+#define INITIALIZED_AO 2
+#define INITIALIZED_GUI 4
+#define INITIALIZED_GETCH2 8
+#define INITIALIZED_SPUDEC 32
+#define INITIALIZED_STREAM 64
+#define INITIALIZED_INPUT 128
+#define INITIALIZED_VOBSUB 256
+#define INITIALIZED_DEMUXER 512
+#define INITIALIZED_ACODEC 1024
+#define INITIALIZED_VCODEC 2048
+#define INITIALIZED_ALL 0xFFFF
#define SUB_SOURCE_SUBS 0
Modified: trunk/mp_msg.c
==============================================================================
--- trunk/mp_msg.c (original)
+++ trunk/mp_msg.c Thu Feb 14 15:23:55 2008
@@ -27,7 +27,7 @@ int use_gui;
/* maximum message length of mp_msg */
#define MSGSIZE_MAX 3072
-int mp_msg_levels[MSGT_MAX]; // verbose level of this module. inited to -2
+int mp_msg_levels[MSGT_MAX]; // verbose level of this module. initialized to -2
int mp_msg_level_all = MSGL_STATUS;
int verbose = 0;
#ifdef USE_ICONV
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c (original)
+++ trunk/mplayer.c Thu Feb 14 15:23:55 2008
@@ -369,7 +369,7 @@ short edl_decision = 0; ///< 1 when an E
FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
int use_filedir_conf;
-static unsigned int inited_flags=0;
+static unsigned int initialized_flags=0;
#include "mpcommon.h"
#include "command.h"
@@ -587,12 +587,12 @@ static void mp_dvdnav_context_free(MPCon
#endif
void uninit_player(unsigned int mask){
- mask=inited_flags&mask;
+ mask=initialized_flags&mask;
mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask);
- if(mask&INITED_ACODEC){
- inited_flags&=~INITED_ACODEC;
+ if(mask&INITIALIZED_ACODEC){
+ initialized_flags&=~INITIALIZED_ACODEC;
current_module="uninit_acodec";
if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio);
#ifdef HAVE_NEW_GUI
@@ -602,8 +602,8 @@ void uninit_player(unsigned int mask){
mpctx->mixer.afilter = NULL;
}
- if(mask&INITED_VCODEC){
- inited_flags&=~INITED_VCODEC;
+ if(mask&INITIALIZED_VCODEC){
+ initialized_flags&=~INITIALIZED_VCODEC;
current_module="uninit_vcodec";
if(mpctx->sh_video) uninit_video(mpctx->sh_video);
mpctx->sh_video=NULL;
@@ -612,8 +612,8 @@ void uninit_player(unsigned int mask){
#endif
}
- if(mask&INITED_DEMUXER){
- inited_flags&=~INITED_DEMUXER;
+ if(mask&INITIALIZED_DEMUXER){
+ initialized_flags&=~INITIALIZED_DEMUXER;
current_module="free_demuxer";
if(mpctx->demuxer){
mpctx->stream=mpctx->demuxer->stream;
@@ -623,15 +623,15 @@ void uninit_player(unsigned int mask){
}
// kill the cache process:
- if(mask&INITED_STREAM){
- inited_flags&=~INITED_STREAM;
+ if(mask&INITIALIZED_STREAM){
+ initialized_flags&=~INITIALIZED_STREAM;
current_module="uninit_stream";
if(mpctx->stream) free_stream(mpctx->stream);
mpctx->stream=NULL;
}
- if(mask&INITED_VO){
- inited_flags&=~INITED_VO;
+ if(mask&INITIALIZED_VO){
+ initialized_flags&=~INITIALIZED_VO;
current_module="uninit_vo";
mpctx->video_out->uninit();
mpctx->video_out=NULL;
@@ -641,45 +641,45 @@ void uninit_player(unsigned int mask){
}
// Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
- if(mask&INITED_GETCH2){
- inited_flags&=~INITED_GETCH2;
+ if(mask&INITIALIZED_GETCH2){
+ initialized_flags&=~INITIALIZED_GETCH2;
current_module="uninit_getch2";
mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
// restore terminal:
getch2_disable();
}
- if(mask&INITED_VOBSUB){
- inited_flags&=~INITED_VOBSUB;
+ if(mask&INITIALIZED_VOBSUB){
+ initialized_flags&=~INITIALIZED_VOBSUB;
current_module="uninit_vobsub";
if(vo_vobsub) vobsub_close(vo_vobsub);
vo_vobsub=NULL;
}
- if (mask&INITED_SPUDEC){
- inited_flags&=~INITED_SPUDEC;
+ if (mask&INITIALIZED_SPUDEC){
+ initialized_flags&=~INITIALIZED_SPUDEC;
current_module="uninit_spudec";
spudec_free(vo_spudec);
vo_spudec=NULL;
}
- if(mask&INITED_AO){
- inited_flags&=~INITED_AO;
+ if(mask&INITIALIZED_AO){
+ initialized_flags&=~INITIALIZED_AO;
current_module="uninit_ao";
if (mpctx->edl_muted) mixer_mute(&mpctx->mixer);
mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
}
#ifdef HAVE_NEW_GUI
- if(mask&INITED_GUI){
- inited_flags&=~INITED_GUI;
+ if(mask&INITIALIZED_GUI){
+ initialized_flags&=~INITIALIZED_GUI;
current_module="uninit_gui";
guiDone();
}
#endif
- if(mask&INITED_INPUT){
- inited_flags&=~INITED_INPUT;
+ if(mask&INITIALIZED_INPUT){
+ initialized_flags&=~INITIALIZED_INPUT;
current_module="uninit_input";
mp_input_uninit();
#ifdef HAVE_MENU
@@ -694,7 +694,7 @@ void uninit_player(unsigned int mask){
void exit_player_with_rc(const char* how, int rc){
if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer);
- uninit_player(INITED_ALL);
+ uninit_player(INITIALIZED_ALL);
#ifdef HAVE_X11
#ifdef HAVE_NEW_GUI
if ( !use_gui )
@@ -755,7 +755,7 @@ static void exit_sighandler(int x){
if (!crash_debug || x != SIGTRAP)
#endif
++sig_count;
- if(inited_flags==0 && sig_count>1) exit(1);
+ if(initialized_flags==0 && sig_count>1) exit(1);
if(sig_count==5)
{
/* We're crashing bad and can't uninit cleanly :(
@@ -1084,7 +1084,7 @@ void update_set_of_subtitles(void)
void init_vo_spudec(void) {
if (vo_spudec)
spudec_free(vo_spudec);
- inited_flags &= ~INITED_SPUDEC;
+ initialized_flags &= ~INITIALIZED_SPUDEC;
vo_spudec = NULL;
if (spudec_ifo) {
unsigned int palette[16], width, height;
@@ -1137,7 +1137,7 @@ void init_vo_spudec(void) {
}
if (vo_spudec!=NULL)
- inited_flags|=INITED_SPUDEC;
+ initialized_flags|=INITIALIZED_SPUDEC;
}
/*
@@ -1589,7 +1589,7 @@ if(mpctx->sh_audio){
mpctx->d_audio->id = -2;
return;
} else
- inited_flags|=INITED_ACODEC;
+ initialized_flags|=INITIALIZED_ACODEC;
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
@@ -1617,13 +1617,13 @@ if(mpctx->sh_audio){
ao_data.format,0))){
// FAILED:
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
- uninit_player(INITED_ACODEC); // close codec
+ uninit_player(INITIALIZED_ACODEC); // close codec
mpctx->sh_audio=mpctx->d_audio->sh=NULL; // -> nosound
mpctx->d_audio->id = -2;
return;
} else {
// SUCCESS:
- inited_flags|=INITED_AO;
+ initialized_flags|=INITIALIZED_AO;
mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n",
mpctx->audio_out->info->short_name,
ao_data.samplerate, ao_data.channels,
@@ -1639,7 +1639,7 @@ if(mpctx->sh_audio){
if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
// mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n");
-// uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
+// uninit_player(INITIALIZED_ACODEC|INITIALIZED_AO); // close codec & ao
// sh_audio=mpctx->d_audio->sh=NULL; // -> nosound
}
#endif
@@ -2121,7 +2121,7 @@ int reinit_video_chain(void) {
sh_video_t * const sh_video = mpctx->sh_video;
double ar=-1.0;
//================== Init VIDEO (codec & libvo) ==========================
- if(!fixed_vo || !(inited_flags&INITED_VO)){
+ if(!fixed_vo || !(initialized_flags&INITIALIZED_VO)){
current_module="preinit_libvo";
//shouldn't we set dvideo->id=-2 when we fail?
@@ -2131,7 +2131,7 @@ int reinit_video_chain(void) {
mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
goto err_out;
}
- inited_flags|=INITED_VO;
+ initialized_flags|=INITIALIZED_VO;
}
if(stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED)
@@ -2190,12 +2190,12 @@ int reinit_video_chain(void) {
init_best_video_codec(sh_video,video_codec_list,video_fm_list);
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
- if(!sh_video->inited){
- if(!fixed_vo) uninit_player(INITED_VO);
+ if(!sh_video->initialized){
+ if(!fixed_vo) uninit_player(INITIALIZED_VO);
goto err_out;
}
- inited_flags|=INITED_VCODEC;
+ initialized_flags|=INITIALIZED_VCODEC;
if (sh_video->codec)
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
@@ -2879,7 +2879,7 @@ else if(!noconsolecontrols)
}
#endif
-inited_flags|=INITED_INPUT;
+initialized_flags|=INITIALIZED_INPUT;
current_module = NULL;
/// Catch signals
@@ -2916,7 +2916,7 @@ current_module = NULL;
if(use_gui){
guiInit();
guiGetEvent(guiSetContext, mpctx);
- inited_flags|=INITED_GUI;
+ initialized_flags|=INITIALIZED_GUI;
guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
}
#endif
@@ -2943,11 +2943,11 @@ play_next_file:
// We must enable getch2 here to be able to interrupt network connection
// or cache filling
if(!noconsolecontrols && !slave_mode){
- if(inited_flags&INITED_GETCH2)
+ if(initialized_flags&INITIALIZED_GETCH2)
mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
else
getch2_enable(); // prepare stdin for hotkeys...
- inited_flags|=INITED_GETCH2;
+ initialized_flags|=INITIALIZED_GETCH2;
mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[init getch2]]]\n");
}
@@ -3096,7 +3096,7 @@ if (edl_output_filename) {
free(buf);
}
if(vo_vobsub){
- inited_flags|=INITED_VOBSUB;
+ initialized_flags|=INITIALIZED_VOBSUB;
vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
// check if vobsub requested only to display forced subtitles
forced_subs_only=vobsub_get_forced_subs_flag(vo_vobsub);
@@ -3127,7 +3127,7 @@ if (edl_output_filename) {
mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
goto goto_next_file;
}
- inited_flags|=INITED_STREAM;
+ initialized_flags|=INITIALIZED_STREAM;
#ifdef HAVE_NEW_GUI
if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream );
@@ -3283,7 +3283,7 @@ if(dvd_chapter>1) {
demuxer_seek_chapter(mpctx->demuxer, dvd_chapter-1, 1, &pts, NULL, NULL);
}
-inited_flags|=INITED_DEMUXER;
+initialized_flags|=INITIALIZED_DEMUXER;
if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) {
int i;
@@ -3579,14 +3579,14 @@ if(!mpctx->sh_audio){
mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks.\n",mpctx->d_audio->packs);
ds_free_packs(mpctx->d_audio); // free buffered chunks
//mpctx->d_audio->id=-2; // do not read audio chunks
- //uninit_player(INITED_AO); // close device
+ //uninit_player(INITIALIZED_AO); // close device
}
if(!mpctx->sh_video){
mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks.\n",mpctx->d_video->packs);
ds_free_packs(mpctx->d_video);
mpctx->d_video->id=-2;
- //if(!fixed_vo) uninit_player(INITED_VO);
+ //if(!fixed_vo) uninit_player(INITIALIZED_VO);
}
if (!mpctx->sh_video && !mpctx->sh_audio)
@@ -3694,7 +3694,7 @@ if(!mpctx->sh_video) {
if (!mpctx->num_buffered_frames) {
double frame_time = update_video(&blit_frame);
mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
- if (mpctx->sh_video->vf_inited < 0) {
+ if (mpctx->sh_video->vf_initialized < 0) {
mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NotInitializeVOPorVO);
mpctx->eof = 1; goto goto_next_file;
}
@@ -3896,7 +3896,7 @@ mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d
if(mpctx->dvbin_reopen)
{
mpctx->eof = 0;
- uninit_player(INITED_ALL-(INITED_GUI|INITED_STREAM|INITED_INPUT|INITED_GETCH2|(fixed_vo?INITED_VO:0)));
+ uninit_player(INITIALIZED_ALL-(INITIALIZED_GUI|INITIALIZED_STREAM|INITIALIZED_INPUT|INITIALIZED_GETCH2|(fixed_vo?INITIALIZED_VO:0)));
cache_uninit(mpctx->stream);
mpctx->dvbin_reopen = 0;
goto goto_enable_cache;
@@ -3935,7 +3935,7 @@ if(benchmark){
}
// time to uninit all, except global stuff:
-uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0)));
+uninit_player(INITIALIZED_ALL-(INITIALIZED_GUI+INITIALIZED_INPUT+(fixed_vo?INITIALIZED_VO:0)));
if ( mpctx->set_of_sub_size > 0 )
{
Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c (original)
+++ trunk/stream/stream_radio.c Thu Feb 14 15:23:55 2008
@@ -125,7 +125,7 @@ typedef struct radio_priv_s {
int audio_buffer_size; ///< size of ringbuffer
int audio_cnt; ///< size of meanfull data inringbuffer
int audio_drop; ///< number of dropped bytes
- int audio_inited;
+ int audio_initialized;
#endif
radio_param_t *radio_param;
} radio_priv_t;
@@ -822,7 +822,7 @@ static int init_audio(radio_priv_t *priv
int is_oss=1;
int seconds=2;
char* tmp;
- if (priv->audio_inited) return 1;
+ if (priv->audio_initialized) return 1;
/* do_capture==0 mplayer was not started with capture keyword, so disabling capture*/
if(!priv->do_capture)
@@ -885,7 +885,7 @@ static int init_audio(radio_priv_t *priv
audio_in_start_capture(&priv->audio_in);
- priv->audio_inited = 1;
+ priv->audio_initialized = 1;
return STREAM_OK;
}
Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c (original)
+++ trunk/stream/tvi_v4l2.c Thu Feb 14 15:23:55 2008
@@ -133,7 +133,7 @@ typedef struct {
volatile int audio_drop;
volatile int shutdown;
- int audio_inited;
+ int audio_initialized;
double audio_secs_per_block;
long long audio_usecs_per_block;
long long audio_skew_total;
@@ -365,7 +365,7 @@ static void setup_audio_buffer_sizes(pri
static void init_audio(priv_t *priv)
{
- if (priv->audio_inited) return;
+ if (priv->audio_initialized) return;
if (!priv->tv_param->noaudio) {
#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
@@ -398,7 +398,7 @@ static void init_audio(priv_t *priv)
if (audio_in_setup(&priv->audio_in) < 0) return;
- priv->audio_inited = 1;
+ priv->audio_initialized = 1;
}
}
@@ -960,28 +960,28 @@ static int control(priv_t *priv, int cmd
return TVI_CONTROL_TRUE;
case TVI_CONTROL_AUD_GET_FORMAT:
init_audio(priv);
- if (!priv->audio_inited) return TVI_CONTROL_FALSE;
+ if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
*(int *)arg = AF_FORMAT_S16_LE;
mp_msg(MSGT_TV, MSGL_V, "%s: get audio format: %d\n",
info.short_name, *(int *)arg);
return TVI_CONTROL_TRUE;
case TVI_CONTROL_AUD_GET_SAMPLERATE:
init_audio(priv);
- if (!priv->audio_inited) return TVI_CONTROL_FALSE;
+ if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
*(int *)arg = priv->audio_in.samplerate;
mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplerate: %d\n",
info.short_name, *(int *)arg);
return TVI_CONTROL_TRUE;
case TVI_CONTROL_AUD_GET_SAMPLESIZE:
init_audio(priv);
- if (!priv->audio_inited) return TVI_CONTROL_FALSE;
+ if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
*(int *)arg = priv->audio_in.bytes_per_sample;
mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplesize: %d\n",
info.short_name, *(int *)arg);
return TVI_CONTROL_TRUE;
case TVI_CONTROL_AUD_GET_CHANNELS:
init_audio(priv);
- if (!priv->audio_inited) return TVI_CONTROL_FALSE;
+ if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
*(int *)arg = priv->audio_in.channels;
mp_msg(MSGT_TV, MSGL_V, "%s: get audio channels: %d\n",
info.short_name, *(int *)arg);
@@ -1170,7 +1170,7 @@ static int init(priv_t *priv)
priv->audio_skew_buffer = NULL;
priv->audio_skew_delta_buffer = NULL;
- priv->audio_inited = 0;
+ priv->audio_initialized = 0;
/* Open the video device. */
priv->video_fd = open(priv->video_dev, O_RDWR);
@@ -1383,7 +1383,7 @@ static int start(priv_t *priv)
/* setup audio parameters */
init_audio(priv);
- if (!priv->tv_param->noaudio && !priv->audio_inited) return 0;
+ if (!priv->tv_param->noaudio && !priv->audio_initialized) return 0;
/* we need this to size the audio buffer properly */
if (priv->immediate_mode) {
Modified: trunk/sub_cc.c
==============================================================================
--- trunk/sub_cc.c (original)
+++ trunk/sub_cc.c Thu Feb 14 15:23:55 2008
@@ -35,7 +35,7 @@ static subtitle *fb,*bb;
static unsigned int cursor_pos=0;
-static int inited=0;
+static int initialized=0;
#define CC_ROLLON 1
#define CC_ROLLUP 2
@@ -102,7 +102,7 @@ void subcc_init(void)
fb=&buf1;
bb=&buf2;
- inited=1;
+ initialized=1;
}
static void append_char(char c)
@@ -326,7 +326,7 @@ static void subcc_decode(unsigned char *
void subcc_process_data(unsigned char *inputdata,unsigned int len)
{
if(!subcc_enabled) return;
- if(!inited) subcc_init();
+ if(!initialized) subcc_init();
subcc_decode(inputdata, len);
}
More information about the MPlayer-cvslog
mailing list