From f0251c53bd46a47a96563aece4054399c450f7ba Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 28 Aug 2004 11:29:48 +0000 Subject: [PATCH] * Spelling fixes. --- debian/changelog | 2 +- doc/mad/DESIGN | 2 +- doc/skins/skins-howto.txt | 2 +- include/vlc_block_helper.h | 4 ++-- modules/access/satellite/access.c | 2 +- modules/demux/avi/avi.c | 2 +- modules/video_output/directx/directx.c | 2 +- modules/video_output/directx/glwin32.c | 2 +- modules/video_output/ggi.c | 2 +- modules/video_output/opengl.c | 2 +- modules/video_output/sdl.c | 2 +- src/input/input.c | 2 +- src/stream_output/stream_output.c | 2 +- src/video_output/video_output.c | 10 +++++----- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index f62b0f7ba9..a98bbb706b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -838,7 +838,7 @@ vlc (0.1.99d) unstable; urgency=low * the YUV transformations are now plugins as well * alternative symlinks like gvlc, fbvlc are now created at compile time * borrowed libmpeg2's GPLed MMX YUV transformations (16 and 32 bits) - * fixed an endianness problem which occured on iMacs + * fixed an endianness problem which occurred on iMacs -- Samuel Hocevar Wed, 12 Jul 2000 01:24:40 +0200 diff --git a/doc/mad/DESIGN b/doc/mad/DESIGN index 12035ba312..637def8c5e 100644 --- a/doc/mad/DESIGN +++ b/doc/mad/DESIGN @@ -20,7 +20,7 @@ libmad_input : called when input data is needed libmad_output : called whenever a frame has been decoded libmad_header : called upon decoding of only a frame header libmad_messages : libmad messages -libmad_error : called whenever an error occured during the decoding process +libmad_error : called whenever an error occurred during the decoding process Design: (ASCII art) ======= diff --git a/doc/skins/skins-howto.txt b/doc/skins/skins-howto.txt index 9336fea347..99780fd377 100644 --- a/doc/skins/skins-howto.txt +++ b/doc/skins/skins-howto.txt @@ -262,7 +262,7 @@ OK, let's go for an enumeration of the different tags and theor attributes : - scroll: if set to 'true', the text will scroll if it does not fit into the 'scrollspace'. Default is "true". - - scrollspace: size in pixel between two occurences of the text when + - scrollspace: size in pixel between two occurrences of the text when scrolling. Default is "20". - display: this value is a bit special, it allows to have a text diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index 69e5b46400..034739f469 100644 --- a/include/vlc_block_helper.h +++ b/include/vlc_block_helper.h @@ -2,7 +2,7 @@ * vlc_block_helper.h: Helper functions for data blocks management. ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: vlc_block_helper.h,v 1.7 2003/12/07 12:11:13 gbazin Exp $ + * $Id$ * * Authors: Gildas Bazin * @@ -460,7 +460,7 @@ static inline int block_FindStartcodeFromOffset( } /* Begin the search. - * We first look for an occurence of the 1st startcode byte and + * We first look for an occurrence of the 1st startcode byte and * if found, we do a more thorough check. */ i_size = p_block->i_buffer + i_size; *pi_offset -= i_size; diff --git a/modules/access/satellite/access.c b/modules/access/satellite/access.c index 6681bcb40f..23819a02e7 100644 --- a/modules/access/satellite/access.c +++ b/modules/access/satellite/access.c @@ -298,7 +298,7 @@ int E_(Open) ( vlc_object_t *p_this ) if ( ioctl_SECControl( i_tuner, i_freq, b_pol, i_lnb_slof, b_diseqc ) < 0 ) { - msg_Err( p_input, "an error occured when controling SEC" ); + msg_Err( p_input, "an error occurred when controling SEC" ); close( p_satellite->i_handle ); free( p_satellite ); return -1; diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index ecdf17d89f..eea48b6c52 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -1648,7 +1648,7 @@ static int AVI_GetKeyFlag( vlc_fourcc_t i_fourcc, uint8_t *p_byte ) */ return p_byte[0] & 0xC0 ? 0 : AVIIF_KEYFRAME; case FOURCC_mp4v: - /* we should find first occurence of 0x000001b6 (32bits) + /* we should find first occurrence of 0x000001b6 (32bits) * startcode: 0x000001b6 32bits * piture type 0(I),1(P) 2bits */ diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c index 560a6b4690..50db94c541 100644 --- a/modules/video_output/directx/directx.c +++ b/modules/video_output/directx/directx.c @@ -464,7 +464,7 @@ static void CloseVideo( vlc_object_t *p_this ) * Manage: handle Sys events ***************************************************************************** * This function should be called regularly by the video output thread. - * It returns a non null value if an error occured. + * It returns a non null value if an error occurred. *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { diff --git a/modules/video_output/directx/glwin32.c b/modules/video_output/directx/glwin32.c index eee84c718f..44d783c23a 100644 --- a/modules/video_output/directx/glwin32.c +++ b/modules/video_output/directx/glwin32.c @@ -249,7 +249,7 @@ static void CloseVideo( vlc_object_t *p_this ) * Manage: handle Sys events ***************************************************************************** * This function should be called regularly by the video output thread. - * It returns a non null value if an error occured. + * It returns a non null value if an error occurred. *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c index b17087a5d2..01a3ccdfeb 100644 --- a/modules/video_output/ggi.c +++ b/modules/video_output/ggi.c @@ -266,7 +266,7 @@ static void Destroy( vlc_object_t *p_this ) * Manage: handle GGI events ***************************************************************************** * This function should be called regularly by video output thread. It returns - * a non null value if an error occured. + * a non null value if an error occurred. *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index ec23d9abb4..fbfe1f5333 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -374,7 +374,7 @@ static void DestroyVout( vlc_object_t *p_this ) * Manage: handle Sys events ***************************************************************************** * This function should be called regularly by video output thread. It returns - * a non null value if an error occured. + * a non null value if an error occurred. *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index 8f791d54ba..b0c5108601 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -317,7 +317,7 @@ static void Close ( vlc_object_t *p_this ) * Manage: handle Sys events ***************************************************************************** * This function should be called regularly by video output thread. It returns - * a non null value if an error occured. + * a non null value if an error occurred. *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { diff --git a/src/input/input.c b/src/input/input.c index 7e5868f140..ef94dba659 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -876,7 +876,7 @@ error: /***************************************************************************** * Error: RunThread() error loop ***************************************************************************** - * This function is called when an error occured during thread main's loop. + * This function is called when an error occurred during thread main's loop. *****************************************************************************/ static void Error( input_thread_t *p_input ) { diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index cad6045f2e..558560e915 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -1005,7 +1005,7 @@ void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix, if( *val2.psz_string ) { free( val2.psz_string ); - msg_Dbg( p_this, "ignoring option %s (not first occurence)", psz_name ); + msg_Dbg( p_this, "ignoring option %s (not first occurrence)", psz_name ); goto next; } free( val2.psz_string ); diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 8ee4438a05..c759bd60bb 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -740,7 +740,7 @@ static void RunThread( vout_thread_t *p_vout) } /* - * Main loop - it is not executed if an error occured during + * Main loop - it is not executed if an error occurred during * initialization */ while( (!p_vout->b_die) && (!p_vout->b_error) ) @@ -981,7 +981,7 @@ static void RunThread( vout_thread_t *p_vout) */ if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) ) { - /* A fatal error occured, and the thread must terminate + /* A fatal error occurred, and the thread must terminate * immediately, without displaying anything - setting b_error to 1 * causes the immediate end of the main while() loop. */ p_vout->b_error = 1; @@ -1062,9 +1062,9 @@ static void RunThread( vout_thread_t *p_vout) /***************************************************************************** * ErrorThread: RunThread() error loop ***************************************************************************** - * This function is called when an error occured during thread main's loop. The - * thread can still receive feed, but must be ready to terminate as soon as - * possible. + * This function is called when an error occurred during thread main's loop. + * The thread can still receive feed, but must be ready to terminate as soon + * as possible. *****************************************************************************/ static void ErrorThread( vout_thread_t *p_vout ) { -- 2.39.5