diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-24 22:00:51 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-24 22:00:51 +0000 |
commit | 6445f83deb596e3f72e03582285a5f180a26a446 (patch) | |
tree | 3c7af2a62f9a2bf9222e69b9cd6686a8c8409ba2 | |
parent | c592535102c0cc2bb3f796bbb83273dda88fc254 (diff) | |
download | mpv-6445f83deb596e3f72e03582285a5f180a26a446.tar.bz2 mpv-6445f83deb596e3f72e03582285a5f180a26a446.tar.xz |
occured --> occurred typo patch by Clinton Roy <croy@dstc.edu.au>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11679 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | DOCS/tech/realcodecs/video-codecs.txt | 2 | ||||
-rw-r--r-- | input/input.h | 4 | ||||
-rw-r--r-- | libao2/ao_alsa5.c | 4 | ||||
-rw-r--r-- | libdha/test.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_acm.c | 2 | ||||
-rw-r--r-- | libvo/vo_vesa.c | 4 | ||||
-rw-r--r-- | vidix/drivers/cyberblade_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/mach64_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/mga_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/nvidia_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/pm3_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/radeon_vid.c | 2 | ||||
-rw-r--r-- | vidix/drivers/sis_vid.c | 2 |
14 files changed, 17 insertions, 17 deletions
@@ -1387,7 +1387,7 @@ mplayer v0.10-pre6: Dec 24 2000 "Xmas edition" - better output at exit (handled now by exit_player()) - mpeg EOF problem (codec restart) fixed: added EOF detection to parse_es.c - internal flag 'current_module' added to get more info at segfaults - (contains module number where the segfault occured) + (contains module number where the segfault occurred) - audio detection changed: using afm=4 (Win32/ACM) for MP3 audio (AVI files) (you MUST have l3codeca.acm at /usr/lib/win32, or you have to use '-afm 1') diff --git a/DOCS/tech/realcodecs/video-codecs.txt b/DOCS/tech/realcodecs/video-codecs.txt index 926b8f8bed..5fd515a23b 100644 --- a/DOCS/tech/realcodecs/video-codecs.txt +++ b/DOCS/tech/realcodecs/video-codecs.txt @@ -16,7 +16,7 @@ error codes (the software uses redmond originated error codes) 4,5 80070005 E_ACCESSDENIED 6 80004003 E_POINTER 7,10 80070057 E_INVALIDREG -8 80040FC1 (or 1FC?: CO_E_OBJISREG) - never occured here +8 80040FC1 (or 1FC?: CO_E_OBJISREG) - never occurred here diff --git a/input/input.h b/input/input.h index 563f632730..4fcdff1925 100644 --- a/input/input.h +++ b/input/input.h @@ -96,9 +96,9 @@ // Error codes for the drivers -// An error occured but we can continue +// An error occurred but we can continue #define MP_INPUT_ERROR -1 -// A fatal error occured, this driver should be removed +// A fatal error occurred, this driver should be removed #define MP_INPUT_DEAD -2 // No input was available #define MP_INPUT_NOTHING -3 diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c index a7d985c72b..95a555d7f1 100644 --- a/libao2/ao_alsa5.c +++ b/libao2/ao_alsa5.c @@ -355,7 +355,7 @@ static int get_space() ch_stat.channel = SND_PCM_CHANNEL_PLAYBACK; if (snd_pcm_channel_status(alsa_handler, &ch_stat) < 0) - return(0); /* error occured */ + return(0); /* error occurred */ else return(ch_stat.free); } @@ -368,7 +368,7 @@ static float get_delay() ch_stat.channel = SND_PCM_CHANNEL_PLAYBACK; if (snd_pcm_channel_status(alsa_handler, &ch_stat) < 0) - return((float)ao_data.buffersize/(float)ao_data.bps); /* error occured */ + return((float)ao_data.buffersize/(float)ao_data.bps); /* error occurred */ else return((float)ch_stat.count/(float)ao_data.bps); } diff --git a/libdha/test.c b/libdha/test.c index 6538ab28c2..03655e90d0 100644 --- a/libdha/test.c +++ b/libdha/test.c @@ -11,7 +11,7 @@ int main( void ) err = pci_scan(lst,&num_pci); if(err) { - printf("Error occured during pci scan: %s\n",strerror(err)); + printf("Error occurred during pci scan: %s\n",strerror(err)); return EXIT_FAILURE; } else diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index a665b264c2..b5f8be75cf 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -145,7 +145,7 @@ static void uninit(sh_audio_t *sh) case ACMERR_NOTPOSSIBLE: return; default: - mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occured: %d\n", ret); + mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %d\n", ret); return; } diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index afeb74f8a0..05b68076c6 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -185,7 +185,7 @@ static inline void __vbeSwitchBank(unsigned long offset) show_err: vesa_term(); PRINT_VBE_ERR("vbeSetWindow",err); - printf("vo_vesa: Fatal error occured! Can't continue\n"); + printf("vo_vesa: Fatal error occurred! Can't continue\n"); abort(); } win.low = new_offset * gran; @@ -387,7 +387,7 @@ static void flip_page(void) { vesa_term(); PRINT_VBE_ERR("vbeSetDisplayStart",err); - printf("vo_vesa: Fatal error occured! Can't continue\n"); + printf("vo_vesa: Fatal error occurred! Can't continue\n"); abort(); } multi_idx = multi_idx ? 0 : 1; diff --git a/vidix/drivers/cyberblade_vid.c b/vidix/drivers/cyberblade_vid.c index 0c1f67dd79..a348b1bd97 100644 --- a/vidix/drivers/cyberblade_vid.c +++ b/vidix/drivers/cyberblade_vid.c @@ -165,7 +165,7 @@ int vixProbe(int verbose, int force) err = pci_scan(lst,&num_pci); if(err) { - printf("[cyberblade] Error occured during pci scan: %s\n",strerror(err)); + printf("[cyberblade] Error occurred during pci scan: %s\n",strerror(err)); return err; } else diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c index a85ff8a252..ea78b0ab2d 100644 --- a/vidix/drivers/mach64_vid.c +++ b/vidix/drivers/mach64_vid.c @@ -404,7 +404,7 @@ int vixProbe(int verbose,int force) err = pci_scan(lst,&num_pci); if(err) { - printf("[mach64] Error occured during pci scan: %s\n",strerror(err)); + printf("[mach64] Error occurred during pci scan: %s\n",strerror(err)); return err; } else diff --git a/vidix/drivers/mga_vid.c b/vidix/drivers/mga_vid.c index 3a2a9d2b33..1e49def06c 100644 --- a/vidix/drivers/mga_vid.c +++ b/vidix/drivers/mga_vid.c @@ -1195,7 +1195,7 @@ int vixProbe(int verbose,int force) err = pci_scan(lst, &num_pci); if (err) { - printf("[mga] Error occured during pci scan: %s\n", strerror(err)); + printf("[mga] Error occurred during pci scan: %s\n", strerror(err)); return(err); } diff --git a/vidix/drivers/nvidia_vid.c b/vidix/drivers/nvidia_vid.c index 47a2f8ce9d..d4908693dc 100644 --- a/vidix/drivers/nvidia_vid.c +++ b/vidix/drivers/nvidia_vid.c @@ -134,7 +134,7 @@ int vixProbe(int verbose, int force){ printf("[nvidia_vid]: warning: forcing not supported yet!\n"); err = pci_scan(lst,&num_pci); if(err){ - printf("[nvidia_vid] Error occured during pci scan: %s\n",strerror(err)); + printf("[nvidia_vid] Error occurred during pci scan: %s\n",strerror(err)); return err; } else { diff --git a/vidix/drivers/pm3_vid.c b/vidix/drivers/pm3_vid.c index b5169d8351..2518cf8bc9 100644 --- a/vidix/drivers/pm3_vid.c +++ b/vidix/drivers/pm3_vid.c @@ -94,7 +94,7 @@ int vixProbe(int verbose, int force) err = pci_scan(lst,&num_pci); if(err) { - printf("[pm3] Error occured during pci scan: %s\n",strerror(err)); + printf("[pm3] Error occurred during pci scan: %s\n",strerror(err)); return err; } else diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c index 4a732136d8..bb93193a95 100644 --- a/vidix/drivers/radeon_vid.c +++ b/vidix/drivers/radeon_vid.c @@ -911,7 +911,7 @@ int vixProbe( int verbose,int force ) err = pci_scan(lst,&num_pci); if(err) { - printf(RADEON_MSG" Error occured during pci scan: %s\n",strerror(err)); + printf(RADEON_MSG" Error occurred during pci scan: %s\n",strerror(err)); return err; } else diff --git a/vidix/drivers/sis_vid.c b/vidix/drivers/sis_vid.c index c8950838ca..f0f0d2d51e 100644 --- a/vidix/drivers/sis_vid.c +++ b/vidix/drivers/sis_vid.c @@ -262,7 +262,7 @@ int vixProbe(int verbose, int force) force = force; err = pci_scan(lst, &num_pci); if (err) { - printf("[SiS] Error occured during pci scan: %s\n", strerror(err)); + printf("[SiS] Error occurred during pci scan: %s\n", strerror(err)); return err; } else { err = ENXIO; |