mirror of
https://github.com/mpv-player/mpv
synced 2024-09-05 02:48:21 +02:00
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
This commit is contained in:
parent
c592535102
commit
6445f83deb
@ -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')
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user