diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/aspect.c | 2 | ||||
| -rw-r--r-- | libvo/osd.c | 2 | ||||
| -rw-r--r-- | libvo/sub.h | 2 | ||||
| -rw-r--r-- | libvo/vo_dga.c | 2 | ||||
| -rw-r--r-- | libvo/vo_directfb.c | 4 | ||||
| -rw-r--r-- | libvo/vo_directfb2.c | 2 | ||||
| -rw-r--r-- | libvo/vo_directx.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl2.c | 2 | ||||
| -rw-r--r-- | libvo/vo_sdl.c | 2 | ||||
| -rw-r--r-- | libvo/vo_svga.c | 2 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 2 |
11 files changed, 12 insertions, 12 deletions
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; |