Fix some common typos.

extras/package/win32/UAC/runas.cpp

@@ -267,7 +267,7 @@ DWORD MyRunAs(HINSTANCE hInstDll,SHELLEXECUTEINFO&sei) {
 
 
 #ifdef BUILD_DBG
-// RunDll exports are __stdcall, we dont care about that for this debug export, rundll32.exe is able to handle this mistake
+// RunDll exports are __stdcall, we don't care about that for this debug export, rundll32.exe is able to handle this mistake
 extern "C" void __declspec(dllexport) __cdecl DBGRDMyRunAs(HWND hwnd,HINSTANCE hinst,LPTSTR lpCmdLine,int nCmdShow) {
 	SHELLEXECUTEINFO sei={sizeof(sei)};
 	sei.lpFile=_T("Notepad.exe");//sei.lpParameters=_T("param1");

include/vlc/libvlc_media.h

@@ -352,7 +352,7 @@ LIBVLC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
  * Save the meta previously set
  *
  * \param p_md the media desriptor
- * \return true if the write operation was successfull
+ * \return true if the write operation was successful
  */
 LIBVLC_API int libvlc_media_save_meta( libvlc_media_t *p_md );
 

include/vlc_es.h

@@ -273,7 +273,7 @@ struct es_format_t
     int      i_profile;       /**< codec specific information (like real audio flavor, mpeg audio layer, h264 profile ...) */
     int      i_level;         /**< codec specific information: indicates maximum restrictions on the stream (resolution, bitrate, codec features ...) */
 
-    bool     b_packetized;  /**< wether the data is packetized (ie. not truncated) */
+    bool     b_packetized;  /**< whether the data is packetized (ie. not truncated) */
     int     i_extra;        /**< length in bytes of extra data pointer */
     void    *p_extra;       /**< extra data needed by some decoders or muxers */
 

include/vlc_sql.h

@@ -304,7 +304,7 @@ static inline void sql_RollbackTransaction( sql_t *p_sql )
  * @param p_sql The SQL object
  * @param p_fmt SQL query string
  * @param i_length length of the string. If negative, length will be
- * considered upto the first \0 character equivalent to strlen(p_fmt).
+ * considered up to the first \0 character equivalent to strlen(p_fmt).
  * Otherwise the first i_length bytes will be used
  * @return a sql_stmt_t pointer or NULL on failure
  */
@@ -384,7 +384,7 @@ static inline int sql_BindDouble( sql_t *p_sql, sql_stmt_t* p_stmt,
  * @param p_stmt Statement Object
  * @param i_pos Position at which the parameter should be bound
  * @param p_fmt Value to be bound
- * @param i_length Length of text. If -ve text upto the first null char
+ * @param i_length Length of text. If -ve text up to the first null char
  * will be selected.
  * @return VLC_SUCCESS or VLC_EGENERIC
  */

modules/access/dvb/linux_dvb.c

@@ -418,7 +418,7 @@ static int ScanParametersDvbC( access_t *p_access, scan_parameter_t *p_scan )
         ? p_frontend->info.frequency_stepsize : 166667;
     p_scan->frequency.i_count = (p_scan->frequency.i_max-p_scan->frequency.i_min)/p_scan->frequency.i_step;
 
-    /* if user supplies modulation or frontend can do auto, dont scan them */
+    /* if user supplies modulation or frontend can do auto, don't scan them */
     if( var_GetInteger( p_access, "dvb-modulation" ) ||
         p_frontend->info.caps & FE_CAN_QAM_AUTO )
     {

modules/codec/dirac.c

@@ -289,13 +289,13 @@ vlc_module_begin()
     change_integer_range(-1, 4);
 
     /* advanced option only */
-    /* NB, unforunately vlc doesn't have a concept of 'dont care' */
+    /* NB, unforunately vlc doesn't have a concept of 'don't care' */
     add_integer( ENC_CFG_PREFIX ENC_MULTIQUANT, -1,
                  ENC_MULTIQUANT_TEXT, ENC_MULTIQUANT_LONGTEXT, true )
     change_integer_range(-1, 1);
 
     /* advanced option only */
-    /* NB, unforunately vlc doesn't have a concept of 'dont care' */
+    /* NB, unforunately vlc doesn't have a concept of 'don't care' */
     add_integer( ENC_CFG_PREFIX ENC_SPARTITION, -1,
                  ENC_SPARTITION_TEXT, ENC_SPARTITION_LONGTEXT, true )
     change_integer_range(-1, 1);

modules/codec/omxil/OMX_Audio.h

@@ -310,7 +310,7 @@ typedef struct OMX_AUDIO_PARAM_VORBISTYPE {
     OMX_U32 nAudioBandWidth;  /**< Audio band width (in Hz) to which an encoder should
                                    limit the audio signal. Use 0 to let encoder decide */
     OMX_S32 nQuality;		  /**< Sets encoding quality to n, between -1 (low) and 10 (high).
-                                   In the default mode of operation, teh quality level is 3.
+                                   In the default mode of operation, the quality level is 3.
                                    Normal quality range is 0 - 10. */
     OMX_BOOL bManaged;		  /**< Set  bitrate  management  mode. This turns off the
                                    normal VBR encoding, but allows hard or soft bitrate

modules/codec/shine/enc_base.h

@@ -166,7 +166,7 @@ struct encoder_config
                                       a new file could start anytime       */
 #define CHUNKF_ABORT      0x0020ul /* Encoder should not finish this
                                       chunk                                */
-#define CHUNKF_ERROR    (~0ul ^ (~0ul >> 1)) /* An error has occured
+#define CHUNKF_ERROR    (~0ul ^ (~0ul >> 1)) /* An error has occurred
                                       (passed to/from encoder). Use the
                                       sign bit to check (long)flags < 0.   */
 #define CHUNKF_ALLFLAGS (0x0033ul | CHUNKF_ERROR)

modules/codec/shine/shine.c

@@ -1372,7 +1372,7 @@ static int quantize_int(int *xr, short *ix, side_info_t *si)
       ix[i] = int2idx[(xr[i] * s + 0x8000) >> 16];
   }
   else
-  { /* check each index wether it fits the table */
+  { /* check each index whether it fits the table */
     for(i=SAMPL2; i--; )
     {
       idx = (xr[i] * s + 0x08000) >> 16;

modules/codec/wmafixed/bitstream.h

@@ -369,7 +369,7 @@ static inline void skip_put_bytes(PutBitContext *s, int n){
 
 /**
  * skips the given number of bits.
- * must only be used if the actual values in the bitstream dont matter
+ * must only be used if the actual values in the bitstream do not matter
  */
 static inline void skip_put_bits(PutBitContext *s, int n){
 #ifdef ALT_BITSTREAM_WRITER

modules/demux/mkv/chapter_command.hpp

@@ -61,7 +61,7 @@ public:
 
     void AddCommand( const KaxChapterProcessCommand & command );
 
-    /// \return wether the codec has seeked in the files or not
+    /// \return whether the codec has seeked in the files or not
     virtual bool Enter() { return false; }
     virtual bool Leave() { return false; }
     virtual std::string GetCodecName( bool ) const { return ""; }
@@ -190,7 +190,7 @@ protected:
     // DVD command IDs
 
     // Tests
-    // wether it's a comparison on the value or register
+    // whether it's a comparison on the value or register
     static const uint16 CMD_DVD_TEST_VALUE          = 0x80;
     static const uint16 CMD_DVD_IF_GPREG_AND        = (1 << 4);
     static const uint16 CMD_DVD_IF_GPREG_EQUAL      = (2 << 4);

modules/demux/mkv/mkv.cpp

@@ -186,7 +186,7 @@ static int Open( vlc_object_t * p_this )
                         if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
                             !s_filename.compare(s_filename.length() - 3, 3, "mka"))
                         {
-                            // test wether this file belongs to our family
+                            // test whether this file belongs to our family
                             const uint8_t *p_peek;
                             bool          file_ok = false;
                             std::string   s_url = make_URI( s_filename.c_str(), "file" );

modules/demux/sid.cpp

@@ -174,7 +174,7 @@ static int Open (vlc_object_t *obj)
     return VLC_SUCCESS;
 
 error:
-    msg_Err (demux, "An error occured during sid demuxing" );
+    msg_Err (demux, "An error occurred during sid demuxing" );
     delete player;
     delete builder;
     delete tune;

modules/demux/subtitle.c

@@ -713,7 +713,7 @@ static void Fix( demux_t *p_demux )
 
     /* *** fix order (to be sure...) *** */
     /* We suppose that there are near in order and this durty bubble sort
-     * wont take too much time
+     * would not take too much time
      */
     do
     {

modules/demux/wav.c

@@ -388,7 +388,7 @@ static int Open( vlc_object_t * p_this )
     return VLC_SUCCESS;
 
 error:
-    msg_Err( p_demux, "An error occured during wav demuxing" );
+    msg_Err( p_demux, "An error occurred during wav demuxing" );
     free( p_wf );
     free( p_sys );
     return VLC_EGENERIC;

modules/gui/macosx/MainWindow.m

@@ -500,7 +500,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)resetPreviousButton
 {
     if (([NSDate timeIntervalSinceReferenceDate] - last_bwd_event) >= 0.35) {
-        // seems like no further event occured, so let's switch the playback item
+        // seems like no further event occurred, so let's switch the playback item
         [[VLCCoreInteraction sharedInstance] previous];
         just_triggered_previous = NO;
     }
@@ -539,7 +539,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (void)resetNextButton
 {
     if (([NSDate timeIntervalSinceReferenceDate] - last_fwd_event) >= 0.35) {
-        // seems like no further event occured, so let's switch the playback item
+        // seems like no further event occurred, so let's switch the playback item
         [[VLCCoreInteraction sharedInstance] next];
         just_triggered_next = NO;
     }

modules/gui/qt4/dialogs/messages.cpp

@@ -175,7 +175,7 @@ void MessagesDialog::sinkMessage( const MsgEvent *msg )
 
     QTextEdit *messages = ui.messages;
     /* Only scroll if the viewport is at the end.
-       Don't bug user by auto-changing/loosing viewport on insert(). */
+       Don't bug user by auto-changing/losing viewport on insert(). */
     bool b_autoscroll = ( messages->verticalScrollBar()->value()
                           + messages->verticalScrollBar()->pageStep()
                           >= messages->verticalScrollBar()->maximum() );

modules/lua/meta.c

@@ -192,7 +192,7 @@ static int read_meta( vlc_object_t *p_this, const char * psz_filename,
     int i_ret = run(p_this, psz_filename, L, "read_meta");
     lua_close( L );
 
-    // Continue even if an error occured: all "meta reader" are always run.
+    // Continue even if an error occurred: all "meta reader" are always run.
     return i_ret == VLC_SUCCESS ? VLC_EGENERIC : i_ret;
 }
 

modules/media_library/ml_watch.c

@@ -412,7 +412,7 @@ static int watch_PlaylistItemCurrent( vlc_object_t *p_this, char const *psz_var,
 }
 
 /**
- * @brief Update informations in the DB for an input item
+ * @brief Update information in the DB for an input item
  *
  * @param p_ml this media library instance
  * @param i_media_id may be 0 (but not recommended)

modules/media_library/sql_monitor.c

@@ -90,7 +90,7 @@ int RemoveDirToMonitor( media_library_t *p_ml, const char *psz_dir )
                           psz_dir );
         if( i_ret != VLC_SUCCESS )
         {
-            msg_Err( p_ml, "Error occured while making a query to the database" );
+            msg_Err( p_ml, "Error occurred while making a query to the database" );
             return i_ret;
         }
         QuerySimple( p_ml, "DELETE FROM directories WHERE uri LIKE '%q%%'",
@@ -105,7 +105,7 @@ int RemoveDirToMonitor( media_library_t *p_ml, const char *psz_dir )
                           psz_dir );
         if( i_ret != VLC_SUCCESS )
         {
-            msg_Err( p_ml, "Error occured while making a query to the database" );
+            msg_Err( p_ml, "Error occurred while making a query to the database" );
             return i_ret;
         }
         QuerySimple( p_ml, "DELETE FROM directories WHERE uri = %Q",

modules/media_library/sql_search.c

@@ -70,7 +70,7 @@ int FindVa( media_library_t *p_ml,
     if( Query( p_ml, &pp_results, &i_rows, &i_cols, "%s", psz_query )
         != VLC_SUCCESS )
     {
-        msg_Err( p_ml, "Error occured while making the query to the database" );
+        msg_Err( p_ml, "Error occurred while making the query to the database" );
         return VLC_EGENERIC;
     }
 
@@ -114,7 +114,7 @@ int FindAdv( media_library_t *p_ml, vlc_array_t *p_result_array,
     if( Query( p_ml, &pp_results, &i_rows, &i_cols, "%s", psz_query )
         != VLC_SUCCESS )
     {
-        msg_Err( p_ml, "Error occured while making the query to the database" );
+        msg_Err( p_ml, "Error occurred while making the query to the database" );
         return VLC_EGENERIC;
     }
 
@@ -861,7 +861,7 @@ exit:
     free( ppsz_frompersons );
 
     if( i_ret != VLC_SUCCESS )
-        msg_Warn( p_ml, "an unknown error occured (%d)", i_ret );
+        msg_Warn( p_ml, "an unknown error occurred (%d)", i_ret );
 
     return i_ret;
 }

modules/misc/audioscrobbler.c

@@ -731,7 +731,7 @@ static void Run(intf_thread_t *p_intf)
                     return;
 
                 case VLC_SUCCESS:
-                    msg_Dbg(p_intf, "Handshake successfull :)");
+                    msg_Dbg(p_intf, "Handshake successful :)");
                     b_handshaked = true;
                     i_interval = 0;
                     next_exchange = mdate();

modules/mmx/fastmemcpy.h

@@ -98,9 +98,9 @@ If you have questions please contact with me: Nick Kurshev: nickols_k@mail.ru.
 #undef HAVE_MMX1
 #if defined(HAVE_MMX) && !defined(HAVE_MMX2) && !defined(HAVE_3DNOW) && !defined(HAVE_SSE)
 /*  means: mmx v.1. Note: Since we added alignment of destinition it speedups
-    of memory copying on PentMMX, Celeron-1 and P2 upto 12% versus
+    of memory copying on PentMMX, Celeron-1 and P2 up to 12% versus
     standard (non MMX-optimized) version.
-    Note: on K6-2+ it speedups memory copying upto 25% and
+    Note: on K6-2+ it speedups memory copying up to 25% and
           on K7 and P3 about 500% (5 times). */
 #define HAVE_MMX1
 #endif

modules/packetizer/dirac.c

@@ -297,7 +297,7 @@ static int block_ChainToArray( block_t *p_block, block_t ***ppp_array)
 
 /**
  * Destructively find and recover the earliest timestamp from start of
- * bytestream, upto i_length.
+ * bytestream, up to i_length.
  */
 static void dirac_RecoverTimestamps ( decoder_t *p_dec, size_t i_length )
 {
@@ -520,7 +520,7 @@ static bool dirac_UnpackSeqHdr( struct seq_hdr_t *p_sh, block_t *p_block )
     uint32_t u_video_format = dirac_uint( &bs ); /* index */
     if( u_video_format > 20 )
     {
-        /* dont know how to parse this header */
+        /* don't know how to parse this header */
         return false;
     }
 
@@ -791,7 +791,7 @@ sync_fail:
     /* recover any timestamps from the data that is about to be flushed */
     dirac_RecoverTimestamps( p_dec, p_sys->i_offset );
 
-    /* flush everything upto the start of the DU */
+    /* flush everything up to the start of the DU */
     block_SkipBytes( &p_sys->bytestream, p_sys->i_offset );
     block_BytestreamFlush( &p_sys->bytestream );
     p_sys->i_offset = 0;
@@ -1038,7 +1038,7 @@ static block_t *dirac_BuildEncapsulationUnit( decoder_t *p_dec, block_t *p_block
  *
  * Returns:
  *  0: everything ok
- *  1: EOS occured, please flush and reset
+ *  1: EOS occurred, please flush and reset
  *  2: picture number discontinuity, please flush and reset
  */
 static int dirac_TimeGenPush( decoder_t *p_dec, block_t *p_block_in )

modules/video_filter/atmo/FnordlichtConnection.cpp

@@ -237,7 +237,7 @@ int CFnordlichtConnection::getAmountFnordlichter()
 
 /*
     def sync(addr = 0)
-       1.upto(15) do
+       1.up to(15) do
           $dev.write "\e"
        end
        $dev.write addr.chr

modules/video_filter/atmo/atmo.cpp

@@ -2062,7 +2062,7 @@ static void ExtractMiniImage_YUV(filter_sys_t *p_sys,
 
     /*  these two ugly loops extract the small image - goes it faster? how?
     the loops are so designed that there is a small border around the extracted
-    image so we wont get column and row - zero from the frame, and not the most
+    image so we won't get column and row - zero from the frame, and not the most
     right and bottom pixels --- which may be clipped on computers useing TV out
     - through overscan!
 

modules/video_filter/opencv_wrapper.c

@@ -459,7 +459,7 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
         {
             //rgb2 gives 3 separate planes, this gives 1 interleaved plane
             //rv24 gives is about 20% faster but gives r&b the wrong way round
-            //and I cant think of an easy way to fix this
+            //and I can't think of an easy way to fix this
             fmt_out.i_chroma = VLC_CODEC_RGB32;
         }
         else if (p_sys->i_internal_chroma == GREY)

modules/video_filter/remoteosd.c

@@ -652,7 +652,7 @@ static void* vnc_worker_thread( void *obj )
 
     if( !handshaking ( p_filter ) )
     {
-        msg_Err( p_filter, "Error occured while handshaking vnc host" );
+        msg_Err( p_filter, "Error occurred while handshaking vnc host" );
         goto exit;
     }
 

modules/video_output/msw/common.c

@@ -179,7 +179,7 @@ void CommonManage(vout_display_t *vd)
              * with the associated window (hvideownd)
              *
              * For directx, it is still important to call UpdateRects
-             * on a move of the parent window, even if no resize occured
+             * on a move of the parent window, even if no resize occurred
              */
             SetWindowPos(sys->hwnd, 0, 0, 0,
                          rect_parent.right - rect_parent.left,

projects/macosx/framework/Headers/Public/VLCMedia.h

@@ -64,7 +64,7 @@ typedef enum VLCMediaState
     VLCMediaStateNothingSpecial,        //< Nothing
     VLCMediaStateBuffering,             //< Stream is buffering
     VLCMediaStatePlaying,               //< Stream is playing
-    VLCMediaStateError,                 //< Can't be played because an error occured
+    VLCMediaStateError,                 //< Can't be played because an error occurred
 } VLCMediaState;
 
 /**

src/playlist/loadsave.c

@@ -133,7 +133,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     if( psz_file == NULL )
         return VLC_ENOMEM;
 
-    /* loosy check for media library file */
+    /* lousy check for media library file */
     struct stat st;
     if( vlc_stat( psz_file, &st ) )
     {

src/playlist/thread.c

@@ -265,7 +265,7 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
         psz_arturl = input_item_GetArtURL( p_input );
         psz_name = input_item_GetName( p_input );
 
-        /* p_input->p_meta should not be null after a successfull CreateThread */
+        /* p_input->p_meta should not be null after a successful CreateThread */
         b_has_art = !EMPTY_STR( psz_arturl );
 
         if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )

src/text/strings.c

@@ -1280,7 +1280,7 @@ out:
   Decodes a duration as defined by ISO 8601
   http://en.wikipedia.org/wiki/ISO_8601#Durations
   @param str A null-terminated string to convert
-  @return: The duration in seconds. -1 if an error occured.
+  @return: The duration in seconds. -1 if an error occurred.
 
   Exemple input string: "PT0H9M56.46S"
  */