# HG changeset patch # User diego # Date 1072303251 0 # Node ID 972d1998bde92b2e655fbe1790bfe4012c195004 # Parent 15883b1e2afa70e1ed370b82a685a7fb25a65941 occured --> occurred typo patch by Clinton Roy diff -r 15883b1e2afa -r 972d1998bde9 ChangeLog --- a/ChangeLog Tue Dec 23 22:47:11 2003 +0000 +++ b/ChangeLog Wed Dec 24 22:00:51 2003 +0000 @@ -1387,7 +1387,7 @@ - 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 -r 15883b1e2afa -r 972d1998bde9 DOCS/tech/realcodecs/video-codecs.txt --- a/DOCS/tech/realcodecs/video-codecs.txt Tue Dec 23 22:47:11 2003 +0000 +++ b/DOCS/tech/realcodecs/video-codecs.txt Wed Dec 24 22:00:51 2003 +0000 @@ -16,7 +16,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 input/input.h --- a/input/input.h Tue Dec 23 22:47:11 2003 +0000 +++ b/input/input.h Wed Dec 24 22:00:51 2003 +0000 @@ -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 -r 15883b1e2afa -r 972d1998bde9 libao2/ao_alsa5.c --- a/libao2/ao_alsa5.c Tue Dec 23 22:47:11 2003 +0000 +++ b/libao2/ao_alsa5.c Wed Dec 24 22:00:51 2003 +0000 @@ -355,7 +355,7 @@ 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 @@ 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 -r 15883b1e2afa -r 972d1998bde9 libdha/test.c --- a/libdha/test.c Tue Dec 23 22:47:11 2003 +0000 +++ b/libdha/test.c Wed Dec 24 22:00:51 2003 +0000 @@ -11,7 +11,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 libmpcodecs/ad_acm.c --- a/libmpcodecs/ad_acm.c Tue Dec 23 22:47:11 2003 +0000 +++ b/libmpcodecs/ad_acm.c Wed Dec 24 22:00:51 2003 +0000 @@ -145,7 +145,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 libvo/vo_vesa.c --- a/libvo/vo_vesa.c Tue Dec 23 22:47:11 2003 +0000 +++ b/libvo/vo_vesa.c Wed Dec 24 22:00:51 2003 +0000 @@ -185,7 +185,7 @@ 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 @@ { 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/cyberblade_vid.c --- a/vidix/drivers/cyberblade_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/cyberblade_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -165,7 +165,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/mach64_vid.c --- a/vidix/drivers/mach64_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/mach64_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -404,7 +404,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/mga_vid.c --- a/vidix/drivers/mga_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/mga_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -1195,7 +1195,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/nvidia_vid.c --- a/vidix/drivers/nvidia_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/nvidia_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -134,7 +134,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/pm3_vid.c --- a/vidix/drivers/pm3_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/pm3_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -94,7 +94,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/radeon_vid.c --- a/vidix/drivers/radeon_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/radeon_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -911,7 +911,7 @@ 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 -r 15883b1e2afa -r 972d1998bde9 vidix/drivers/sis_vid.c --- a/vidix/drivers/sis_vid.c Tue Dec 23 22:47:11 2003 +0000 +++ b/vidix/drivers/sis_vid.c Wed Dec 24 22:00:51 2003 +0000 @@ -262,7 +262,7 @@ 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;