[MPlayer-dev-eng] [PATCH] Numerous english spelling fixes in MPlayer source
gabucino at mplayerhq.hu
gabucino at mplayerhq.hu
Thu Sep 25 10:12:03 CEST 2003
I created the attached patch based on the mail of Bernard Leak
<bernard 4t brenda-arkle.demon.co.uk>
There were some obvious typos in liba52 and libmpeg2 sub-directories, but I
didn't correct them by intent (possible later syncing issues). Also, I'm not
really sure if Michael's typos are worth correcting (he's gonna use them again
and again;), but I think none of these would hurt.
--
Gabucino
MPlayer Core Team
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.773
diff -u -r1.773 configure
--- configure 21 Sep 2003 17:05:28 -0000 1.773
+++ configure 25 Sep 2003 08:44:11 -0000
@@ -5360,7 +5360,7 @@
fi
echocheck "ftello()"
-# if we dont have ftello map it to ftell
+# if we don't have ftello map it to ftell
cat > $TMPC << EOF
#include <stdio.h>
int main (void) { ftello(stdin); return 0; }
Index: spudec.c
===================================================================
RCS file: /cvsroot/mplayer/main/spudec.c,v
retrieving revision 1.42
diff -u -r1.42 spudec.c
--- spudec.c 21 Sep 2003 14:21:11 -0000 1.42
+++ spudec.c 25 Sep 2003 08:44:11 -0000
@@ -304,7 +304,7 @@
/*
This function tries to create a usable palette.
- Is searchs how many non-transparent colors are used and assigns different
+ It determines how many non-transparent colors are used, and assigns different
gray scale values to each color.
I tested it with four streams and even got something readable. Half of the
times I got black characters with white around and half the reverse.
Index: unrarlib.h
===================================================================
RCS file: /cvsroot/mplayer/main/unrarlib.h,v
retrieving revision 1.2
diff -u -r1.2 unrarlib.h
--- unrarlib.h 2 Nov 2002 18:32:11 -0000 1.2
+++ unrarlib.h 25 Sep 2003 08:44:11 -0000
@@ -61,7 +61,7 @@
/*#define _USE_MEMORY_TO_MEMORY_DECOMPRESSION*/ /* read file from memory or a */
/* resource instead of reading */
- /* from a file. NOTE: you wont't*/
+ /* from a file. NOTE: you won't */
/* be able to decompress from */
/* file if you enable this */
/* option! */
Index: DOCS/tech/osd.txt
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/tech/osd.txt,v
retrieving revision 1.2
diff -u -r1.2 osd.txt
--- DOCS/tech/osd.txt 13 Apr 2002 12:46:14 -0000 1.2
+++ DOCS/tech/osd.txt 25 Sep 2003 08:44:11 -0000
@@ -49,7 +49,7 @@
typedef struct mp_osd_obj_s {
struct mp_osd_obj_s* next;
unsigned char type;
- unsigned char alignment; // 2 bits: x;y percents, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
+ unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
unsigned short flags;
int x,y; // coords
unsigned char color[4]; // YUVA
Index: drivers/mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v
retrieving revision 1.54
diff -u -r1.54 mga_vid.c
--- drivers/mga_vid.c 31 Aug 2003 20:57:34 -0000 1.54
+++ drivers/mga_vid.c 25 Sep 2003 08:44:11 -0000
@@ -1518,7 +1518,7 @@
// we are not using devfs, use the minor
// number to specify the card we are using
- // we dont have that many cards
+ // we don't have that many cards
if(minor >= mga_cards_num)
return(-ENXIO);
Index: drivers/radeon/radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v
retrieving revision 1.42
diff -u -r1.42 radeon_vid.c
--- drivers/radeon/radeon_vid.c 25 Jul 2002 13:38:14 -0000 1.42
+++ drivers/radeon/radeon_vid.c 25 Sep 2003 08:44:12 -0000
@@ -88,7 +88,7 @@
static struct { int vram; int vram_valid; } smtrr;
#endif
MODULE_PARM(swap_fourcc, "i");
-MODULE_PARM_DESC(swap_fourcc, "Swap fourcc (dont't swap=0(default))");
+MODULE_PARM_DESC(swap_fourcc, "Swap fourcc (don't swap=0(default))");
static int swap_fourcc __initdata = 0;
#ifdef RAGE128
Index: libaf/filter.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/filter.c,v
retrieving revision 1.3
diff -u -r1.3 filter.c
--- libaf/filter.c 2 Feb 2003 02:42:56 -0000 1.3
+++ libaf/filter.c 25 Sep 2003 08:44:12 -0000
@@ -370,7 +370,7 @@
Note that Butterworth numerator is 1 for all filter sections, which
means s^2 = 0 and s^1 = 0
- Lets convert standard Butterworth polynomials into this form:
+ Let's convert standard Butterworth polynomials into this form:
0 + 0 + 1 0 + 0 + 1
--------------------------- * --------------------------
Index: libao2/ao_alsa9.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa9.c,v
retrieving revision 1.39
diff -u -r1.39 ao_alsa9.c
--- libao2/ao_alsa9.c 21 Sep 2003 09:49:05 -0000 1.39
+++ libao2/ao_alsa9.c 25 Sep 2003 08:44:12 -0000
@@ -408,13 +408,13 @@
if ((tmp_device = snd_pcm_info_get_device(alsa_info)) < 0)
{
- printf("alsa-init: cant get device\n");
+ printf("alsa-init: can't get device\n");
return(0);
}
if ((tmp_subdevice = snd_pcm_info_get_subdevice(alsa_info)) < 0)
{
- printf("alsa-init: cant get subdevice\n");
+ printf("alsa-init: can't get subdevice\n");
return(0);
}
@@ -423,7 +423,7 @@
if ((err = snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%1d,%1d", tmp_device, tmp_subdevice)) <= 0)
{
- printf("alsa-init: cant wrote device-id\n");
+ printf("alsa-init: can't write device-id\n");
}
snd_pcm_info_free(alsa_info);
Index: libao2/pl_delay.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/pl_delay.c,v
retrieving revision 1.7
diff -u -r1.7 pl_delay.c
--- libao2/pl_delay.c 21 Mar 2003 16:42:50 -0000 1.7
+++ libao2/pl_delay.c 25 Sep 2003 08:44:12 -0000
@@ -1,4 +1,4 @@
-/* Audio out plugin it doesnt't really do anything useful but serves
+/* Audio out plugin it doesn't really do anything useful but serves
an example of how audio plugins work. It delays the output signal
by the nuber of samples set by delay=n where n is the number of
bytes.
Index: libmpcodecs/vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.103
diff -u -r1.103 vd_ffmpeg.c
--- libmpcodecs/vd_ffmpeg.c 11 Sep 2003 00:16:33 -0000 1.103
+++ libmpcodecs/vd_ffmpeg.c 25 Sep 2003 08:44:12 -0000
@@ -30,7 +30,7 @@
#endif
#if LIBAVCODEC_BUILD < 4641
-#error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS
+#error we don't support libavcodec prior to build 4641, get the latest libavcodec CVS
#endif
#if LIBAVCODEC_BUILD < 4645
@@ -469,7 +469,7 @@
mpi= mpcodecs_get_image(sh,type, flags,
(width+align)&(~align), (height+align)&(~align));
- // ok, lets see what did we get:
+ // ok, let's see what did we get:
if( mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
!(mpi->flags&MP_IMGFLAG_DIRECT)){
// nice, filter/vo likes draw_callback :)
Index: libmpcodecs/ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.74
diff -u -r1.74 ve_lavc.c
--- libmpcodecs/ve_lavc.c 19 Sep 2003 18:45:02 -0000 1.74
+++ libmpcodecs/ve_lavc.c 25 Sep 2003 08:44:13 -0000
@@ -37,7 +37,7 @@
#endif
#if LIBAVCODEC_BUILD < 4641
-#error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS
+#error we don't support libavcodec prior to build 4641, get the latest libavcodec CVS
#endif
#if LIBAVCODEC_BUILD < 4659
Index: libmpcodecs/vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.12
diff -u -r1.12 vf_lavc.c
--- libmpcodecs/vf_lavc.c 15 Mar 2003 18:01:02 -0000 1.12
+++ libmpcodecs/vf_lavc.c 25 Sep 2003 08:44:13 -0000
@@ -22,7 +22,7 @@
#endif
#if LIBAVCODEC_BUILD < 4641
-#error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS
+#error we don't support libavcodec prior to build 4641, get the latest libavcodec CVS
#endif
#if LIBAVCODEC_BUILD < 4645
Index: libmpdemux/cue_read.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cue_read.c,v
retrieving revision 1.5
diff -u -r1.5 cue_read.c
--- libmpdemux/cue_read.c 6 Jan 2003 09:44:28 -0000 1.5
+++ libmpdemux/cue_read.c 25 Sep 2003 08:44:13 -0000
@@ -376,7 +376,7 @@
tracks[nTracks].minute = sect;
- /* lets calculate the start sectors and offsets */
+ /* let's calculate the start sectors and offsets */
for(i = 0; i <= nTracks; i++)
{
tracks[i].start_sector = cue_msf_2_sector(tracks[i].minute,
Index: libmpdemux/demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.33
diff -u -r1.33 demux_ogg.c
--- libmpdemux/demux_ogg.c 2 Sep 2003 16:35:39 -0000 1.33
+++ libmpdemux/demux_ogg.c 25 Sep 2003 08:44:13 -0000
@@ -322,7 +322,7 @@
{
vorbis_info *vi = &((ov_struct_t*)context)->vi;
- // When we dump the audio, there is no vi, but we dont care of timestamp in this case
+ // When we dump the audio, there is no vi, but we don't care of timestamp in this case
int32_t blocksize = vorbis_packet_blocksize(vi,pack) / vi->channels;
// Calculate the timestamp if the packet don't have any
if(pack->granulepos == -1) {
Index: libmpdemux/demux_ty.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty.c,v
retrieving revision 1.1
diff -u -r1.1 demux_ty.c
--- libmpdemux/demux_ty.c 9 Jun 2003 00:24:22 -0000 1.1
+++ libmpdemux/demux_ty.c 25 Sep 2003 08:44:14 -0000
@@ -387,7 +387,7 @@
if( demux->stream->eof ) return 0;
// ======================================================================
- // If we haven't figured out the size of the stream, lets do so
+ // If we haven't figured out the size of the stream, let's do so
// ======================================================================
#ifdef STREAMTYPE_STREAM_TY
if ( demux->stream->type == STREAMTYPE_STREAM_TY )
@@ -532,7 +532,7 @@
0x20000 ) );
- // Lets make a Video Demux Stream for Mplayer
+ // Let's make a Video Demux Stream for Mplayer
aid = 0x0;
if( !demux->v_streams[ aid ] ) new_sh_video( demux, aid );
if( demux->video->id == -1 ) demux->video->id = aid;
Index: libmpdemux/demux_ty_osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty_osd.c,v
retrieving revision 1.3
diff -u -r1.3 demux_ty_osd.c
--- libmpdemux/demux_ty_osd.c 12 Sep 2003 15:55:45 -0000 1.3
+++ libmpdemux/demux_ty_osd.c 25 Sep 2003 08:44:14 -0000
@@ -549,7 +549,7 @@
else
{
// We displayed that piece of XDS information long enough
- // Lets move on
+ // Let's move on
ty_XDSDisplayCount++;
if ( ty_XDSDisplayCount >= XDS_DISPLAY_FRAMES )
{
Index: libmpdemux/pnm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/pnm.c,v
retrieving revision 1.8
diff -u -r1.8 pnm.c
--- libmpdemux/pnm.c 30 Jun 2003 16:42:38 -0000 1.8
+++ libmpdemux/pnm.c 25 Sep 2003 08:44:14 -0000
@@ -441,7 +441,7 @@
/* client id string */
p->buffer[c]=PNA_CLIENT_STRING;
- i16=BE_16D((strlen(client_string)-1)); /* dont know why do we have -1 here */
+ i16=BE_16D((strlen(client_string)-1)); /* don't know why do we have -1 here */
memcpy(&p->buffer[c+1],&i16,2);
memcpy(&p->buffer[c+3],client_string,strlen(client_string)+1);
c=c+3+strlen(client_string)+1;
@@ -673,7 +673,7 @@
}
/* skip bytewise to next chunk.
- * seems, that we dont need that, if we send enough
+ * seems, that we don't need that, if we send enough
* keepalives
*/
n=0;
Index: libmpdemux/tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.8
diff -u -r1.8 tvi_bsdbt848.c
--- libmpdemux/tvi_bsdbt848.c 6 Sep 2003 00:24:05 -0000 1.8
+++ libmpdemux/tvi_bsdbt848.c 25 Sep 2003 08:44:14 -0000
@@ -795,7 +795,7 @@
}
/* When mencoder wants audio data, it wants data..
- it wont go do anything else until it gets it :( */
+ it won't go do anything else until it gets it :( */
if(bytesavail == 0) return FRAGSIZE;
Index: libmpdemux/realrtsp/rtsp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/realrtsp/rtsp.c,v
retrieving revision 1.4
diff -u -r1.4 rtsp.c
--- libmpdemux/realrtsp/rtsp.c 11 Jun 2003 16:48:08 -0000 1.4
+++ libmpdemux/realrtsp/rtsp.c 25 Sep 2003 08:44:14 -0000
@@ -571,7 +571,7 @@
#endif
seq=1;
}
- /* lets make the server happy */
+ /* let's make the server happy */
rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood");
rest=malloc(sizeof(char)*16);
sprintf(rest,"CSeq: %u", seq);
@@ -633,7 +633,7 @@
s->server_state=RTSP_CONNECTED;
- /* now lets send an options request. */
+ /* now let's send an options request. */
rtsp_schedule_field(s, "CSeq: 1");
rtsp_schedule_field(s, s->user_agent);
rtsp_schedule_field(s, "ClientChallenge: 9e26d33f2984236010ef6253fb1887f7");
Index: libvo/aspect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/aspect.c,v
retrieving revision 1.14
diff -u -r1.14 aspect.c
--- libvo/aspect.c 21 Sep 2003 15:34:51 -0000 1.14
+++ libvo/aspect.c 25 Sep 2003 08:44:14 -0000
@@ -64,7 +64,7 @@
#ifdef ASPECT_DEBUG
printf("aspect(0) no aspect forced!\n");
#endif
- return; // the user doesnt want to fix aspect
+ return; // the user doesn't want to fix aspect
}
#ifdef ASPECT_DEBUG
printf("aspect(0) fitin: %dx%d zoom: %d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
Index: libvo/osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/osd.c,v
retrieving revision 1.19
diff -u -r1.19 osd.c
--- libvo/osd.c 3 Aug 2003 18:33:28 -0000 1.19
+++ libvo/osd.c 25 Sep 2003 08:44:14 -0000
@@ -240,7 +240,7 @@
fast_osd_16bpp_table[i]=((i>>3)<<11)|((i>>2)<<5)|(i>>3);
}
#endif
-//FIXME the optimized stuff is a lie for 15/16bpp as they arent optimized yet
+//FIXME the optimized stuff is a lie for 15/16bpp as they aren't optimized yet
if(verbose)
{
#ifdef RUNTIME_CPUDETECT
Index: libvo/sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.27
diff -u -r1.27 sub.h
--- libvo/sub.h 24 Jan 2003 10:24:06 -0000 1.27
+++ libvo/sub.h 25 Sep 2003 08:44:14 -0000
@@ -23,7 +23,7 @@
typedef struct mp_osd_obj_s {
struct mp_osd_obj_s* next;
unsigned char type;
- unsigned char alignment; // 2 bits: x;y percents, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
+ unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
unsigned short flags;
int x,y;
int dxs,dys;
Index: libvo/vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.66
diff -u -r1.66 vo_dga.c
--- libvo/vo_dga.c 28 Jul 2003 14:54:19 -0000 1.66
+++ libvo/vo_dga.c 25 Sep 2003 08:44:14 -0000
@@ -727,7 +727,7 @@
return 1;
}
-// now lets start the DGA thing
+// now let's start the DGA thing
if ( !vo_config_count || width != prev_width || height != prev_height )
{
Index: libvo/vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.27
diff -u -r1.27 vo_directfb.c
--- libvo/vo_directfb.c 15 Aug 2003 13:04:37 -0000 1.27
+++ libvo/vo_directfb.c 25 Sep 2003 08:44:15 -0000
@@ -362,7 +362,7 @@
DFBCHECK (DirectFBCreate (&dfb));
DFBCHECK (dfb->SetCooperativeLevel (dfb, DFSCL_FULLSCREEN));
- // lets try to get YUY2 layer - borrowed from DirectFb examples
+ // let's try to get YUY2 layer - borrowed from DirectFb examples
/* Enumerate display layers */
DFBCHECK (dfb->EnumDisplayLayers( dfb, enum_layers_callback, &videolayer ));
@@ -1496,7 +1496,7 @@
framelocked=0;
};
#endif
- // lets clear blackborders
+ // let's clear blackborders
primary->SetColor(primary,0,0,0,0);
// top
primary->FillRectangle(primary,0,0,screen_width,yoffset);
Index: libvo/vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.13
diff -u -r1.13 vo_directfb2.c
--- libvo/vo_directfb2.c 7 Sep 2003 19:42:35 -0000 1.13
+++ libvo/vo_directfb2.c 25 Sep 2003 08:44:15 -0000
@@ -1486,7 +1486,7 @@
void *dst;
int pitch;
- unlock(); // isnt it silly I have to unlock surface and than lock it again :-)
+ unlock(); // isn't it silly I have to unlock surface and then lock it again :-)
if (frame) {
DFBCHECK (frame->Lock(frame,DSLF_WRITE|DSLF_READ,&dst,&pitch));
Index: libvo/vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.20
diff -u -r1.20 vo_directx.c
--- libvo/vo_directx.c 21 Sep 2003 10:31:22 -0000 1.20
+++ libvo/vo_directx.c 25 Sep 2003 08:44:15 -0000
@@ -249,7 +249,7 @@
case DDERR_NODIRECTDRAWHW:
{mp_msg(MSGT_VO, MSGL_ERR,"no directdraw hardware\n");break;}
case DDERR_NOEMULATION:
- {mp_msg(MSGT_VO, MSGL_ERR,"cant emulate\n");break;}
+ {mp_msg(MSGT_VO, MSGL_ERR,"can't emulate\n");break;}
case DDERR_NOFLIPHW:
{mp_msg(MSGT_VO, MSGL_ERR,"hardware can't do flip\n");break;}
case DDERR_NOOVERLAYHW:
Index: libvo/vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.36
diff -u -r1.36 vo_gl2.c
--- libvo/vo_gl2.c 21 Sep 2003 15:44:23 -0000 1.36
+++ libvo/vo_gl2.c 25 Sep 2003 08:44:16 -0000
@@ -556,7 +556,7 @@
} /* for all texnumx */
} /* for all texnumy */
- /* YES - lets catch this error ...
+ /* YES - let's catch this error ...
*/
(void) glGetError ();
}
Index: libvo/vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.105
diff -u -r1.105 vo_sdl.c
--- libvo/vo_sdl.c 7 Sep 2003 18:15:47 -0000 1.105
+++ libvo/vo_sdl.c 25 Sep 2003 08:44:16 -0000
@@ -561,7 +561,7 @@
priv->surface=NULL;
}
- /* DONT attempt to free the fullscreen modes array. SDL_Quit* does this for us */
+ /* DON'T attempt to free the fullscreen modes array. SDL_Quit* does this for us */
return 0;
}
Index: libvo/vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.69
diff -u -r1.69 vo_svga.c
--- libvo/vo_svga.c 21 Sep 2003 23:59:49 -0000 1.69
+++ libvo/vo_svga.c 25 Sep 2003 08:44:16 -0000
@@ -475,7 +475,7 @@
//we may try to set a bigger stride for video mode that will match the mpi->stride,
//this way we will transfer more data, but HW put_image can do it in backgraund!
-//now lets see how many pages we can use
+//now let's see how many pages we can use
max_pages = modeinfo->maxpixels/(modeinfo->height * modeinfo->width);
if(max_pages > MAXPAGES) max_pages = MAXPAGES;
if(!vo_doublebuffering) max_pages=1;
Index: libvo/vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.134
diff -u -r1.134 vo_x11.c
--- libvo/vo_x11.c 31 Aug 2003 22:27:10 -0000 1.134
+++ libvo/vo_x11.c 25 Sep 2003 08:44:17 -0000
@@ -275,7 +275,7 @@
XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
/* set image size (which is indeed neither the input nor output size),
- if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here
+ if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here
*/
image_width=(width + 7) & (~7);
image_height=height;
Index: loader/resource.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/resource.c,v
retrieving revision 1.3
diff -u -r1.3 resource.c
--- loader/resource.c 13 Sep 2002 19:43:13 -0000 1.3
+++ loader/resource.c 25 Sep 2003 08:44:17 -0000
@@ -354,7 +354,7 @@
return 0;
}
#if 0
- WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
+ WARN("Don't know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
#endif
}
Index: postproc/cs_test.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/cs_test.c,v
retrieving revision 1.3
diff -u -r1.3 cs_test.c
--- postproc/cs_test.c 23 May 2003 20:21:31 -0000 1.3
+++ postproc/cs_test.c 25 Sep 2003 08:44:17 -0000
@@ -72,7 +72,7 @@
uint8_t *dst= dstBuffer+dstOffset;
char *name=NULL;
- if(failed) break; //dont fill the screen with shit ...
+ if(failed) break; //don't fill the screen with shit ...
switch(funcNum){
case 0:
Index: postproc/swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.128
diff -u -r1.128 swscale.c
--- postproc/swscale.c 19 Jun 2003 21:28:56 -0000 1.128
+++ postproc/swscale.c 25 Sep 2003 08:44:17 -0000
@@ -728,7 +728,7 @@
#endif //ARCH_X86
-// minor note: the HAVE_xyz is messed up after that line so dont use it
+// minor note: the HAVE_xyz is messed up after that line so don't use it
static double getSplineCoeff(double a, double b, double c, double d, double dist)
{
@@ -983,7 +983,7 @@
if(cutOff > SWS_MAX_REDUCE_CUTOFF) break;
- /* preserve Monotonicity because the core cant handle the filter otherwise */
+ /* preserve Monotonicity because the core can't handle the filter otherwise */
if(i<dstW-1 && (*filterPos)[i] >= (*filterPos)[i+1]) break;
// Move filter coeffs left
@@ -1702,7 +1702,7 @@
if(clip_table[512] != 255) globalInit();
if(rgb15to16 == NULL) sws_rgb2rgb_init(flags);
- /* avoid dupplicate Formats, so we dont need to check to much */
+ /* avoid duplicate Formats, so we don't need to check to much */
srcFormat = remove_dup_fourcc(origSrcFormat);
dstFormat = remove_dup_fourcc(origDstFormat);
@@ -1872,7 +1872,7 @@
c->lumXInc+= 20;
c->chrXInc+= 20;
}
- //we dont use the x86asm scaler if mmx is available
+ //we don't use the x86asm scaler if mmx is available
else if(flags & SWS_CPU_CAPS_MMX)
{
c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
@@ -1894,7 +1894,7 @@
srcFilter->chrH, dstFilter->chrH);
#ifdef ARCH_X86
-// cant downscale !!!
+// can't downscale !!!
if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
{
c->lumMmx2Filter = (int16_t*)memalign(8, (dstW /8+8)*sizeof(int16_t));
@@ -1920,7 +1920,7 @@
(flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
srcFilter->chrV, dstFilter->chrV);
- // Calculate Buffer Sizes so that they wont run out while handling these damn slices
+ // Calculate Buffer Sizes so that they won't run out while handling these damn slices
c->vLumBufSize= c->vLumFilterSize;
c->vChrBufSize= c->vChrFilterSize;
for(i=0; i<dstH; i++)
@@ -2076,7 +2076,7 @@
}
/**
- * swscale warper, so we dont need to export the SwsContext.
+ * swscale warper, so we don't need to export the SwsContext.
* assumes planar YUV to be in YUV order instead of YVU
*/
int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
@@ -2085,7 +2085,7 @@
}
/**
- * swscale warper, so we dont need to export the SwsContext
+ * swscale warper, so we don't need to export the SwsContext
*/
int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStrideParam[]){
Index: postproc/swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.102
diff -u -r1.102 swscale_template.c
--- postproc/swscale_template.c 21 Apr 2003 23:14:21 -0000 1.102
+++ postproc/swscale_template.c 25 Sep 2003 08:44:17 -0000
@@ -950,7 +950,7 @@
int uvalpha1=uvalpha^4095;
int i;
-#if 0 //isnt used
+#if 0 //isn't used
if(flags&SWS_FULL_CHR_H_INT)
{
switch(dstFormat)
@@ -1169,7 +1169,7 @@
#ifdef HAVE_MMX
switch(c->dstFormat)
{
-//Note 8280 == DSTW_OFFSET but the preprocessor cant handle that there :(
+//Note 8280 == DSTW_OFFSET but the preprocessor can't handle that there :(
case IMGFMT_BGR32:
asm volatile(
"movl %%esp, "ESP_OFFSET"(%5) \n\t"
@@ -2211,7 +2211,7 @@
}
#ifdef HAVE_MMX
- // use the new MMX scaler if th mmx2 cant be used (its faster than the x86asm one)
+ // use the new MMX scaler if the mmx2 can't be used (its faster than the x86asm one)
if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed))
#else
if(!(flags&SWS_FAST_BILINEAR))
@@ -2303,7 +2303,7 @@
: "%eax", "%ebx", "%ecx", "%edi", "%esi"
);
#ifdef HAVE_MMX2
- } //if MMX2 cant be used
+ } //if MMX2 can't be used
#endif
#else
int i;
@@ -2379,7 +2379,7 @@
}
#ifdef HAVE_MMX
- // use the new MMX scaler if th mmx2 cant be used (its faster than the x86asm one)
+ // use the new MMX scaler if the mmx2 can't be used (its faster than the x86asm one)
if(!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed))
#else
if(!(flags&SWS_FAST_BILINEAR))
@@ -2482,7 +2482,7 @@
: "%eax", "%ebx", "%ecx", "%edi", "%esi"
);
#ifdef HAVE_MMX2
- } //if MMX2 cant be used
+ } //if MMX2 can't be used
#endif
#else
int i;
@@ -2698,7 +2698,7 @@
//wrap buf index around to stay inside the ring buffer
if(lumBufIndex >= vLumBufSize ) lumBufIndex-= vLumBufSize;
if(chrBufIndex >= vChrBufSize ) chrBufIndex-= vChrBufSize;
- break; //we cant output a dstY line so lets try with the next slice
+ break; //we can't output a dstY line so let's try with the next slice
}
#ifdef HAVE_MMX
@@ -2772,7 +2772,7 @@
}
}
}
- else // hmm looks like we cant use MMX here without overwriting this arrays tail
+ else // hmm looks like we can't use MMX here without overwriting this array's tail
{
int16_t **lumSrcPtr= lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
int16_t **chrSrcPtr= chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
Index: vidix/drivers/mach64_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v
retrieving revision 1.33
diff -u -r1.33 mach64_vid.c
--- vidix/drivers/mach64_vid.c 8 Apr 2003 16:23:09 -0000 1.33
+++ vidix/drivers/mach64_vid.c 25 Sep 2003 08:44:18 -0000
@@ -780,8 +780,8 @@
config->offsets[i] = config->offsets[i-1] + config->frame_size;
/*FIXME the left / top stuff is broken (= zoom a src rectangle from a larger one)
- 1. the framesize isnt known as the outer src rectangle dimensions arent known
- 2. the mach64 needs aligned addresses so it cant work anyway
+ 1. the framesize isn't known as the outer src rectangle dimensions aren't known
+ 2. the mach64 needs aligned addresses so it can't work anyway
-> so we could shift the outer buffer to compensate that but that would mean
alignment problems for the code which writes into it
*/
Index: vidix/drivers/pm3_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/pm3_vid.c,v
retrieving revision 1.2
diff -u -r1.2 pm3_vid.c
--- vidix/drivers/pm3_vid.c 31 Mar 2003 00:14:35 -0000 1.2
+++ vidix/drivers/pm3_vid.c 25 Sep 2003 08:44:18 -0000
@@ -196,7 +196,7 @@
#define FORMAT_VUY422 PM3VideoOverlayMode_COLORFORMAT_VUY422
#define FORMAT_YUV422 PM3VideoOverlayMode_COLORFORMAT_YUV422
-/* Notice, have to check that we dont overflow the deltas here ... */
+/* Notice, have to check that we don't overflow the deltas here ... */
static void
compute_scale_factor(
short* src_w, short* dst_w,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 232 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20030925/f7ed9b14/attachment.pgp>
More information about the MPlayer-dev-eng
mailing list