Mercurial > mplayer.hg

changeset 7875:b890315b36d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l
author arpi
date Wed, 23 Oct 2002 18:51:19 +0000
parents 4c832590e18e
children af8233ef7161
files libvo/geometry.h libvo/vo_fbdev.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/geometry.h	Wed Oct 23 18:20:13 2002 +0000
+++ b/libvo/geometry.h	Wed Oct 23 18:51:19 2002 +0000
@@ -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);
 
--- a/libvo/vo_fbdev.c	Wed Oct 23 18:20:13 2002 +0000
+++ b/libvo/vo_fbdev.c	Wed Oct 23 18:51:19 2002 +0000
@@ -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 +