diff options
37 files changed, 61 insertions, 61 deletions
diff --git a/DOCS/tech/osd.txt b/DOCS/tech/osd.txt index e13959944f..2927ecfa2e 100644 --- a/DOCS/tech/osd.txt +++ b/DOCS/tech/osd.txt @@ -49,7 +49,7 @@ ok, my first draft: 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 @@ -5365,7 +5365,7 @@ if test "$_largefiles" = yes || freebsd ; then 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; } diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c index e187c3c18d..3b8ebac0a6 100644 --- a/drivers/mga_vid.c +++ b/drivers/mga_vid.c @@ -1518,7 +1518,7 @@ static int mga_vid_open(struct inode *inode, struct file *file) // 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); diff --git a/drivers/radeon/radeon_vid.c b/drivers/radeon/radeon_vid.c index 518710f393..3e5b9a5db0 100644 --- a/drivers/radeon/radeon_vid.c +++ b/drivers/radeon/radeon_vid.c @@ -88,7 +88,7 @@ static int mtrr __initdata = 1; 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 diff --git a/libaf/filter.c b/libaf/filter.c index ea401a7ebc..10f1c975d2 100644 --- a/libaf/filter.c +++ b/libaf/filter.c @@ -370,7 +370,7 @@ void bilinear(_ftype_t* a, _ftype_t* b, _ftype_t* k, _ftype_t fs, _ftype_t *coef 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 --------------------------- * -------------------------- diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c index 8f05e884bb..ce43b7e843 100644 --- a/libao2/ao_alsa1x.c +++ b/libao2/ao_alsa1x.c @@ -408,13 +408,13 @@ static int init(int rate_hz, int channels, int format, int flags) 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 @@ static int init(int rate_hz, int channels, int format, int flags) 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); diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c index 8f05e884bb..ce43b7e843 100644 --- a/libao2/ao_alsa9.c +++ b/libao2/ao_alsa9.c @@ -408,13 +408,13 @@ static int init(int rate_hz, int channels, int format, int flags) 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 @@ static int init(int rate_hz, int channels, int format, int flags) 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); diff --git a/libao2/pl_delay.c b/libao2/pl_delay.c index 55df925439..e39489505f 100644 --- a/libao2/pl_delay.c +++ b/libao2/pl_delay.c @@ -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. diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index c9a7b568e6..a5117fa0a7 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -30,7 +30,7 @@ LIBVD_EXTERN(ffmpeg) #endif #if LIBAVCODEC_BUILD < 4641 -#error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS +#error we do not support libavcodec prior to build 4641, get the latest libavcodec CVS #endif #if LIBAVCODEC_BUILD < 4645 @@ -469,7 +469,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ 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 :) diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 43c24de67d..cfa2b72a13 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -37,7 +37,7 @@ extern char* passtmpfile; #endif #if LIBAVCODEC_BUILD < 4641 -#error we dont support libavcodec prior to build 4641, get the latest libavcodec CVS +#error we do not support libavcodec prior to build 4641, get the latest libavcodec CVS #endif #if LIBAVCODEC_BUILD < 4659 diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index 57378e9b05..d3d6afca4b 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -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 do not support libavcodec prior to build 4641, get the latest libavcodec CVS #endif #if LIBAVCODEC_BUILD < 4645 diff --git a/libmpdemux/cue_read.c b/libmpdemux/cue_read.c index a2da833372..ae43a789b2 100644 --- a/libmpdemux/cue_read.c +++ b/libmpdemux/cue_read.c @@ -376,7 +376,7 @@ int cue_read_cue (char *in_cue_filename) 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, diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index c357937cad..9f64231f5f 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -322,7 +322,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vo { 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) { diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index a0f96e2b3b..69329a5166 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -387,7 +387,7 @@ int demux_ty_fill_buffer( demuxer_t *demux ) 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 @@ int demux_ty_fill_buffer( demuxer_t *demux ) 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; diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 188cabfeea..3e5ec2667d 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -549,7 +549,7 @@ static void ty_DisplayXDSInfo() 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 ) { diff --git a/libmpdemux/pnm.c b/libmpdemux/pnm.c index 52bc09a715..da9e2b6f83 100644 --- a/libmpdemux/pnm.c +++ b/libmpdemux/pnm.c @@ -441,7 +441,7 @@ static void pnm_send_request(pnm_t *p, uint32_t bandwidth) { /* 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 @@ static int pnm_get_stream_chunk(pnm_t *p) { } /* 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; diff --git a/libmpdemux/realrtsp/rtsp.c b/libmpdemux/realrtsp/rtsp.c index 5223d6bba1..f346b6b13a 100644 --- a/libmpdemux/realrtsp/rtsp.c +++ b/libmpdemux/realrtsp/rtsp.c @@ -571,7 +571,7 @@ int rtsp_read_data(rtsp_t *s, char *buffer, unsigned int size) { #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 @@ rtsp_t *rtsp_connect(int fd, char* mrl, char *path, char *host, int port, char * 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"); diff --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c index 32f66650e3..8b93c0c70f 100644 --- a/libmpdemux/tvi_bsdbt848.c +++ b/libmpdemux/tvi_bsdbt848.c @@ -795,7 +795,7 @@ if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0) } /* 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; diff --git a/libvo/aspect.c b/libvo/aspect.c index ae86290761..26b665fb35 100644 --- a/libvo/aspect.c +++ b/libvo/aspect.c @@ -64,7 +64,7 @@ void aspect(int *srcw, int *srch, int zoom){ #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, diff --git a/libvo/osd.c b/libvo/osd.c index 6c45b88c6c..42c996c000 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -240,7 +240,7 @@ void vo_draw_alpha_init(){ 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 diff --git a/libvo/sub.h b/libvo/sub.h index 46af2b6fc5..782fa12af2 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -23,7 +23,7 @@ typedef struct mp_osd_bbox_s { 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; diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 098149f330..f7aacaf02d 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -727,7 +727,7 @@ static uint32_t config( uint32_t width, uint32_t height, 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 ) { diff --git a/libvo/vo_directfb.c b/libvo/vo_directfb.c index e9c24271b2..b3c5902a25 100644 --- a/libvo/vo_directfb.c +++ b/libvo/vo_directfb.c @@ -362,7 +362,7 @@ if (verbose) printf("DirectFB: Preinit entered\n"); 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 @@ static void draw_osd(void) 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); diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 8c857c1245..857267192f 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -1486,7 +1486,7 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, 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)); diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 752824a9aa..6b5fb8604c 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -249,7 +249,7 @@ static uint32_t Directx_CreateOverlay(uint32_t imgfmt) 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: diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 3abf0ed2f9..13c94b2d1c 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -556,7 +556,7 @@ static void drawTextureDisplay () } /* for all texnumx */ } /* for all texnumy */ - /* YES - lets catch this error ... + /* YES - let's catch this error ... */ (void) glGetError (); } diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 0dd7b553ba..d1653dd105 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -564,7 +564,7 @@ static int sdl_close (void) 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; } diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index 5eab25e3d8..605fee716b 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -475,7 +475,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, //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; diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 4207c57fdf..07b1c9045a 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -275,7 +275,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t 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; diff --git a/loader/resource.c b/loader/resource.c index 3cb69bd004..0157f6d7ce 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -354,7 +354,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, 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 } diff --git a/postproc/cs_test.c b/postproc/cs_test.c index 9059dac9c9..aad26e236a 100644 --- a/postproc/cs_test.c +++ b/postproc/cs_test.c @@ -72,7 +72,7 @@ main(int argc, char **argv) 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: diff --git a/postproc/swscale.c b/postproc/swscale.c index 25f94e02ca..4d2411516f 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -728,7 +728,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l #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 @@ static inline void initFilter(int16_t **outFilter, int16_t **filterPos, int *out 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 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int 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 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int 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 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int 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 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int (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++) @@ -2079,7 +2079,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int } /** - * 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, @@ -2088,7 +2088,7 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli } /** - * 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[]){ diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 7aed9882ca..58788ce3b2 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -950,7 +950,7 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, uint16_t *buf0, uint16_t * 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 @@ FULL_YSCALEYUV2RGB #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 @@ static inline void RENAME(hyscale)(uint16_t *dst, int dstWidth, uint8_t *src, in } #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 @@ FUNNY_Y_CODE : "%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 @@ inline static void RENAME(hcscale)(uint16_t *dst, int dstWidth, uint8_t *src1, u } #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 @@ FUNNY_UV_CODE : "%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 @@ i--; //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 @@ i--; } } } - 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; @@ -304,7 +304,7 @@ static void spudec_process_data(spudec_handle_t *this, packet_t *packet) /* 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. diff --git a/unrarlib.h b/unrarlib.h index d9ee085e9f..e225b60d42 100644 --- a/unrarlib.h +++ b/unrarlib.h @@ -61,7 +61,7 @@ extern "C" /*#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! */ diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c index 9c18ce999b..a85ff8a252 100644 --- a/vidix/drivers/mach64_vid.c +++ b/vidix/drivers/mach64_vid.c @@ -780,8 +780,8 @@ for(i=0; i<32; i++){ 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 */ diff --git a/vidix/drivers/pm3_vid.c b/vidix/drivers/pm3_vid.c index 3c678e10fd..b5169d8351 100644 --- a/vidix/drivers/pm3_vid.c +++ b/vidix/drivers/pm3_vid.c @@ -196,7 +196,7 @@ int vixQueryFourcc(vidix_fourcc_t *to) #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, |