Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv31260 Modified Files: geometry.h vo_fbdev.c Log Message: 10l Index: geometry.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/geometry.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- geometry.h 23 Oct 2002 16:52:54 -0000 1.1 +++ geometry.h 23 Oct 2002 18:51:19 -0000 1.2 @@ -2,8 +2,6 @@ #ifndef __GEOMETRY_H #define __GEOMETRY_H -#include "aspect.h" - extern char *vo_geometry; int geometry(int *xpos, int *ypos, int scrw, int scrh, int vidw, int vidh, int fs); Index: vo_fbdev.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- vo_fbdev.c 23 Oct 2002 16:52:54 -0000 1.72 +++ vo_fbdev.c 23 Oct 2002 18:51:19 -0000 1.73 @@ -1037,7 +1037,7 @@ image_width=width; image_height=height; } - geometry(&x_offset,&y_offset,fb_xres,fb_yres,image_width,image_height); + geometry(&x_offset,&y_offset,fb_xres,fb_yres,image_width,image_height,fs); if(vidix_init(width,height,x_offset,y_offset,image_width, image_height,format,fb_bpp, @@ -1061,7 +1061,7 @@ return 1; } - geometry(&x_offset,&y_offset,fb_xres,fb_yres,out_width,out_height); + geometry(&x_offset,&y_offset,fb_xres,fb_yres,out_width,out_height,fs); L123123875 = frame_buffer + (out_width - in_width) * fb_pixel_size / 2 + ( (out_height - in_height) / 2 ) * fb_line_len +