diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-14 14:23:55 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-14 14:23:55 +0000 |
commit | 835c654bb0089933c5dd85a8ca123581cda1169e (patch) | |
tree | a49757d0460577d3b70c63bf9a36ec714ff3a81a /libmpdemux | |
parent | 440d7d25755bc850b7ee58e88e2bd8d6c18baea7 (diff) | |
download | mpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.bz2 mpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.xz |
typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_ogg.c | 8 | ||||
-rw-r--r-- | libmpdemux/demux_ty_osd.c | 6 | ||||
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 2 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 717f3ccd8d..44816cf3bc 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -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_packet(ogg_stream_t* os,ogg_packet* pack,vo 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 *sh, ogg_demuxer_t *od) } 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* demuxer) { { 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); diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 03fb45f9d3..5b484999d6 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -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* buf, int len ) 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* buf, int len ) ty_pOSD1 = &ty_OSD1; ty_pOSD2 = &ty_OSD2; tyOSDUpdate = 0; - tyOSDInited = 1; + tyOSDInitialized = 1; } if ( buf[ 0 ] == 0x01 ) diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 68f2d8f01f..c32262359c 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -1111,7 +1111,7 @@ static int get_packet_stats(muxer_priv_t *priv, muxer_stream_t *s, pack_stats_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; diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 7fb897cdd7..1c727f07c8 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -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 |